From owner-freebsd-ports Wed Sep 11 9:40:35 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBFE237B400 for ; Wed, 11 Sep 2002 09:40:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3C3943E42 for ; Wed, 11 Sep 2002 09:40:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8BGe3JU084398 for ; Wed, 11 Sep 2002 09:40:03 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8BGe3nm084397; Wed, 11 Sep 2002 09:40:03 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 134E137B400 for ; Wed, 11 Sep 2002 09:31:54 -0700 (PDT) Received: from kiwi.adsl.isdnet.net (kiwi.adsl.isdnet.net [195.154.177.33]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6EDD043E42 for ; Wed, 11 Sep 2002 09:31:52 -0700 (PDT) (envelope-from kiwi@kiwi.adsl.isdnet.net) Received: by kiwi.adsl.isdnet.net (Postfix, from userid 1000) id 13E6B251B0; Wed, 11 Sep 2002 18:31:49 +0200 (CEST) Message-Id: <20020911163149.13E6B251B0@kiwi.adsl.isdnet.net> Date: Wed, 11 Sep 2002 18:31:49 +0200 (CEST) From: Xavier Beaudouin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/42661: Maintainer Update: lang/pike adding support for Sybase Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 42661 >Category: ports >Synopsis: Maintainer Update: lang/pike adding support for Sybase >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Sep 11 09:40:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Xavier Beaudouin >Release: FreeBSD 4.7-PRERELEASE i386 >Organization: The Caudium Group >Environment: System: FreeBSD mail.home.oav.net 4.7-PRERELEASE FreeBSD 4.7-PRERELEASE #0: Mon Sep 9 09:35:01 CEST 2002 root@mail.home.oav.net:/usr/src/sys/compile/MAIL i386 Port collection from today >Description: Added Sybase / MS-SQL support via FreeTDS. Added batch build support and WITH_ functionality. >How-To-Repeat: >Fix: diff -u -r --new-file pike.old/Makefile pike/Makefile --- pike.old/Makefile Wed Sep 11 15:30:09 2002 +++ pike/Makefile Wed Sep 11 18:26:21 2002 @@ -7,6 +7,7 @@ PORTNAME= pike PORTVERSION= 7.0.361 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ftp://ftp.oav.net/pike/7.0/ \ ftp://ftp.oav.net/caudium/pkg/FreeBSD/distfiles/ \ @@ -18,30 +19,189 @@ BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison/ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ + tiff.4:${PORTSDIR}/graphics/tiff \ + gdbm.2:${PORTSDIR}/databases/gdbm + WRKSRC= ${WRKDIR}/${DISTNAME}/src/ -IS_INTERACTIVE= yes +WANT_MESA= yes +WANT_GTK= yes +WANT_GNOME= yes + GNU_CONFIGURE= yes .include -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.else -CONFIGURE_ARGS?= \ - --without-ttflib \ - --without-gdbm \ - --without-mysql \ - --without-postgresql \ - --without-msql \ - --without-jpeg +# FreeBSD doesn't include libgmp so adding a dependency +.if ${OSVERSION} >= 500000 +LIB_DEPENDS+= gmp.6:${PORTSDIR}/math/libgmp4 +.endif + +.if defined(BATCH) +WITH_TTF= yes +WITH_MYSQL= yes +WITH_FREETDS= yes .endif -CONFIGURE_ARGS+= --without-debug --with-poll --with-oob --with-max-fds=10000 --without-GTK + +CONFIGURE_ARGS+= \ + --without-debug \ + --with-double-precision \ + --with-long-double-precision \ + --with-gmp \ + --with-poll \ + --with-oob \ + --with-max-fds=60000 \ + --with-jpeg \ + --with-tifflib \ + --with-readline \ + --with-gdbm \ + --with-zlib \ + --with-threads \ + --without-perl \ + --without-ssleay \ + --prefix=${PREFIX} +# --without-GTK + PLIST_SUB+= PORTVERSION=${PORTVERSION} -pre-fetch: -.if !defined(BATCH) - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.pike +.if exists(${LOCALBASE}/lib/libttf.so.4) +WITH_TTF= yes +.endif + +.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10) +WITH_MYSQL= yes +.endif + +.if exists(${LOCALBASE}/lib/libpq.so.2) +WITH_POSTGRES= yes +.endif + +.if exists(${LOCALBASE}/lib/libct.so.0) +WITH_FREETDS= yes +.endif + +.if exists(${LOCALBASE}/lib/libodbc.so.1) +WITH_UNIXODBC= yes +.endif + +.if exists(${LOCALBASE}/lib/libiodbc.so.2) +WITH_IODBC= yes +.endif + +.if exists(${LOCALBASE}/lib/libgtkgl.so.5) +WITH_MESA= yes +.endif + +.if defined(WITH_OPTIMIZED_CFLAGS) +.if (${MACHINE} == "i386") +CFLAGS+= -O3 -ffast-math -fomit-frame-pointer +.else +CFLAGS+= -ffast-math -fomit-frame-pointer +.endif +.endif + +.if defined(WITH_TTF) +LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype +CONFIGURE_ARGS+= --with-ttflib +.else +CONFIGURE_ARGS+= --without-ttflib +.endif + +.if defined(WITH_MYSQL) +LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client +CONFIGURE_ARGS+= --with-mysql=${PREFIX} +.else +CONFIGURE_ARGS+= --without-mysql +.endif + +.if defined(WITH_POSTGRES) +LIB_DEPENDS+= pq.2:${PORTSDIR}/databases/postgresql7 +CONFIGURE_ARGS+= --with-pgsql=${PREFIX}/pgsql +.else +CONFIGURE_ARGS+= --without-pgsql +.endif + +.if defined(WITH_FREETDS) +LIB_DEPENDS+= ct.0:${PORTSDIR}/databases/freetds +CONFIGURE_ARGS+= --with-sybase +.else +CONFIGURE_ARGS+= --without-sybase +.endif + +.if defined(WITH_MSQL) +BUILD_DEPENDS+= msql:${PORTSDIR}/databases/msql +CONFIGURE_ARGS+= --with-msql=${PREFIX} +.else +CONFIGURE_ARGS+= --without-msql +.endif + +.if defined(WITH_UNIXODBC) +LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC +CONFIGURE_ARGS+= --with-odbc +.endif + +.if defined(WITH_IODBC) +LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc +CONFIGURE_ARGS+= --with-odbc +.endif + +.if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC) +CONFIGURE_ARGS+= --without-odbc +.endif + +.if defined(WITH_SANE) +LIB_DEPENDS+= sane.1:${PORTSDIR}/graphics/sane-backends +CONFIGURE_ARGS+= --with-sane +.else +CONFIGURE_ARGS+= --without-sane +.endif + +.if defined(HAVE_MESA) || defined(WITH_MESA) +USE_MESA= yes +LIB_DEPENDS+= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea +CONFIGURE_ARGS+= --with-GL --with-GLUT +.else +CONFIGURE_ARGS+= --without-GL --without-GLUT +.endif + +.if defined(HAVE_GNOME) +USE_GNOME= yes +USE_GTK= yes +USE_GLI= yes +GTK_CONFIG= ${X11BASE}/bin/gtk12-config +CONFIGURE_ARGS+= --with-GTK --with-gnome --with-glade +.else +CONFIGURE_ARGS+= --without-GTK --without-gnome --without-glade +.endif + +pre-everything:: +.if !defined(WITH_OPTIMIZED_CFLAGS) + @${ECHO_MSG} "You can enable additional compilation optimizations" + @${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS" +.endif +.if !defined(WITH_TTF) + @${ECHO_MSG} "You can enable _Image_TTF support by defining WITH_TTF." +.endif +.if !defined(WITH_MYSQL) + @${ECHO_MSG} "You can enable MySQL support by defining WITH_MYSQL." +.endif +.if !defined(WITH_POSTGRES) + @${ECHO_MSG} "You can enable PostGres support by defining WITH_POSTGRES." +.endif +.if !defined(WITH_FREETDS) + @${ECHO_MSG} "You can enable Sybase / MS-SQL support by defining WITH_FREETDS" +.endif +.if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC) + @${ECHO_MSG} "You can enable unixODBC support by defining WITH_UNIXODBC." + @${ECHO_MSG} "You can enable iodbc support by defining WITH_IODBC." + @${ECHO_MSG} "Note that you can support only ONE of these two ODBC libs." +.endif +.if !defined(WITH_SANE) + @${ECHO_MSG} "You can enable Sane support by defining WITH_SANE." +.endif +.if !defined(WITH_SANE) || !defined(HAVE_MESA) + @${ECHO_MSG} "You can enable MesaGL support by defining WITH_MESA." .endif pre-configure: Binary files pike.old/pike-7.0.361_1.tbz and pike/pike-7.0.361_1.tbz differ diff -u -r --new-file pike.old/pkg-plist pike/pkg-plist --- pike.old/pkg-plist Wed Sep 11 15:30:09 2002 +++ pike/pkg-plist Wed Sep 11 17:39:21 2002 @@ -57,8 +57,6 @@ pike/%%PORTVERSION%%/lib/modules/sprintf.pmod pike/%%PORTVERSION%%/lib/modules/sybase.so pike/%%PORTVERSION%%/lib/modules/system.pmod -pike/%%PORTVERSION%%/lib/modules/GL.so -pike/%%PORTVERSION%%/lib/modules/GLUT.so pike/%%PORTVERSION%%/lib/modules/Colors.pmod pike/%%PORTVERSION%%/lib/modules/Array.pmod pike/%%PORTVERSION%%/lib/modules/Function.pmod @@ -435,6 +433,10 @@ pike/%%PORTVERSION%%/include/pike/aclocal.m4 pike/%%PORTVERSION%%/man/man1/hilfe.1 pike/%%PORTVERSION%%/man/man1/pike.1 +@unexec rm %D/pike/%%PORTVERSION%%/lib/modules/GL.so 2> /dev/null || true +@unexec rm %D/pike/%%PORTVERSION%%/lib/modules/GLUT.so 2> /dev/null || true +@unexec rm %D/pike/%%PORTVERSION%%/lib/modules/GLU.pmod.o 2> /dev/null || true +@unexec rm %D/pike/%%PORTVERSION%%/lib/modules/Perl.so 2> /dev/null || true @dirrm pike/%%PORTVERSION%%/bin @dirrm pike/%%PORTVERSION%%/lib/modules/ADT.pmod @dirrm pike/%%PORTVERSION%%/lib/modules/Crypto diff -u -r --new-file pike.old/scripts/configure.pike pike/scripts/configure.pike --- pike.old/scripts/configure.pike Wed Sep 11 15:30:09 2002 +++ pike/scripts/configure.pike Thu Jan 1 01:00:00 1970 @@ -1,131 +0,0 @@ -#!/bin/sh - -if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then - exit -fi - -/usr/bin/dialog --title "configuration options" --clear \ - --checklist "\n\ -Please select desired options:" -1 -1 11 \ -FreeType "TrueType font rendering" OFF \ -JPEG "support JPEG" OFF \ -threads "threads support" ON \ -GDBM "GNU database manager support" OFF \ -zlib "zlib library support" ON \ -gmp "support bignums" ON \ -readline "support for command line editing" ON \ -MySQL "MySQL database support" OFF \ -PostgreSQL "PostgreSQL database support" OFF \ -mSQL "mSQL database support" OFF \ -ssl "SSL support" OFF \ -2> /tmp/checklist.tmp.$$ -retval=$? - -if [ -s /tmp/checklist.tmp.$$ ]; then - set `cat /tmp/checklist.tmp.$$` -fi -rm -f /tmp/checklist.tmp.$$ - -case $retval in - 0) if [ -z "$*" ]; then - echo "Nothing selected" - fi - ;; - 1) echo "Cancel pressed." - exit 1 - ;; -esac - -mkdir -p ${WRKDIRPREFIX}${CURDIR} -> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - -while [ "$1" ]; do - case $1 in - \"FreeType\") - echo 'LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - echo 'CONFIGURE_ARGS+= --with-ttflib' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - FreeType=1 - ;; - \"threads\") - threads=1 - ;; - \"gmp\") - echo '.if ${OSVERSION} >= 500000' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - echo 'LIB_DEPENDS+= gmp.6:${PORTSDIR}/math/libgmp4' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - echo '.endif' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - echo 'CONFIGURE_ARGS+= --with-gmp' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - gmp=1 - ;; - \"readline\") - echo 'CONFIGURE_ARGS+= --with-readline' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - readline=1 - ;; - \"JPEG\") - echo 'LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - echo 'CONFIGURE_ARGS+= --with-jpeg=${PREFIX}' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - JPEG=1 - ;; - \"GDBM\") - echo 'LIB_DEPENDS+= gdbm.2:${PORTSDIR}/databases/gdbm' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - echo 'CONFIGURE_ARGS+= --with-gdbm=${PREFIX}' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - GDBM=1 - ;; - \"zlib\") - echo 'CONFIGURE_ARGS+= --with-zlib' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - zlib=1 - ;; - \"MySQL\") - echo 'LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - echo 'CONFIGURE_ARGS+= --with-mysql=${PREFIX}' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - MySQL=1 - ;; - \"PostgreSQL\") - echo 'BUILD_DEPENDS+= ${PREFIX}/pgsql/bin/psql:${PORTSDIR}/databases/postgresql7' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - echo 'CONFIGURE_ARGS+= --with-pgsql=${PREFIX}/pgsql' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - PostgresSQL=1 - ;; - \"mSQL\") - echo 'BUILD_DEPENDS+= msql:${PORTSDIR}/databases/msql' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - echo 'CONFIGURE_ARGS+= --with-msql=${PREFIX}' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - mSQL=1 - ;; - \"ssl\") - echo 'CONFIGURE_ARGS+= --with-ssleay' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - ssl=1 - ;; - esac - shift -done -if [ -z "$FreeType" ]; then - echo 'CONFIGURE_ARGS+= --without-ttflib' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -fi -if [ -z "$threads" ]; then - echo 'CONFIGURE_ARGS+= --without-threads' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -fi -if [ -z "$GDBM" ]; then - echo 'CONFIGURE_ARGS+= --without-gdbm' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -fi -if [ -z "$zlib" ]; then - echo 'CONFIGURE_ARGS+= --without-zlib' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -fi -if [ -z "$MySQL" ]; then - echo 'CONFIGURE_ARGS+= --without-mysql' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -fi -if [ -z "$PostgreSQL" ]; then - echo 'CONFIGURE_ARGS+= --without-postgresql' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -fi -if [ -z "$mSQL" ]; then - echo 'CONFIGURE_ARGS+= --without-msql' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -fi -if [ -z "$gmp" ]; then - echo 'CONFIGURE_ARGS+= --without-gmp --without-bignums' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -fi -if [ -z "$JPEG" ]; then - echo 'CONFIGURE_ARGS+= --without-jpeg' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -fi -if [ -z "$readline" ]; then - echo 'CONFIGURE_ARGS+= --without-readline' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -if [ -z "$ssl" ]; then - echo 'CONFIGURE_ARGS+= --without-ssl' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -fi -fi >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message