diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/gtksql/Makefile | 20 | ||||
| -rw-r--r-- | databases/postgresql-devel-server/Makefile | 48 | ||||
| -rw-r--r-- | databases/postgresql-devel/Makefile | 48 | ||||
| -rw-r--r-- | databases/postgresql7/Makefile | 48 | ||||
| -rw-r--r-- | databases/postgresql73-server/Makefile | 48 | ||||
| -rw-r--r-- | databases/postgresql73/Makefile | 48 | ||||
| -rw-r--r-- | databases/postgresql74-server/Makefile | 48 | ||||
| -rw-r--r-- | databases/postgresql80-server/Makefile | 48 | ||||
| -rw-r--r-- | databases/postgresql81-server/Makefile | 48 | ||||
| -rw-r--r-- | databases/postgresql82-server/Makefile | 48 | ||||
| -rw-r--r-- | databases/postgresql83-server/Makefile | 48 | ||||
| -rw-r--r-- | databases/postgresql84-server/Makefile | 48 | ||||
| -rw-r--r-- | databases/postgresql90-server/Makefile | 48 | ||||
| -rw-r--r-- | databases/postgresql91-server/Makefile | 48 | ||||
| -rw-r--r-- | databases/postgresql92-server/Makefile | 48 | 
15 files changed, 304 insertions, 388 deletions
| diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index 7602a28e2acc..be3ed04a8942 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -14,34 +14,34 @@ MAINTAINER=	domi@saargate.de  LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -.if defined(PACKAGE_BUILDING) && !defined(USE_MYSQL) && !defined(USE_PGSQL) -USE_MYSQL=	yes +.if defined(PACKAGE_BUILDING) && !defined(WITH_MYSQL) && !defined(WITH_PGSQL) +WITH_MYSQL=	yes  .endif -.if defined(USE_MYSQL) +.if defined(WITH_MYSQL)  LIB_DEPENDS +=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client  .endif -.if defined(USE_PGSQL) +.if defined(WITH_PGSQL)  LIB_DEPENDS +=	pq.2:${PORTSDIR}/databases/postgresql  .endif  USE_X_PREFIX=	yes  pre-patch: -.if !defined(USE_MYSQL) && !defined(USE_PGSQL) +.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL)  	@ ${ECHO} "You must specify which database to use, possible are:"  	@ ${ECHO} -	@ ${ECHO} "make USE_MYSQL=yes (for MySQL support)" -	@ ${ECHO} "make USE_PGSQL=yes (for PostgreSQL support)" -	@ ${ECHO} "make USE_MYSQL=yes USE_PGSQL=yes (for both MySQL and PostgreSQL support)" +	@ ${ECHO} "make WITH_MYSQL=yes (for MySQL support)" +	@ ${ECHO} "make WITH_PGSQL=yes (for PostgreSQL support)" +	@ ${ECHO} "make WITH_MYSQL=yes WITH_PGSQL=yes (for both MySQL and PostgreSQL support)"  	@ ${FALSE}  .endif  do-configure: -.if defined(USE_MYSQL) +.if defined(WITH_MYSQL)  	@ ${PERL} -i -pe "s/^#MYSQL/MYSQL/g" ${WRKDIR}/${DISTNAME}/Makefile  .endif -.if defined(USE_PGSQL) +.if defined(WITH_PGSQL)  	@ ${PERL} -i -pe "s/^#PGSQL/PGSQL/g" ${WRKDIR}/${DISTNAME}/Makefile  .endif diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql-devel-server/Makefile +++ b/databases/postgresql-devel-server/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql-devel/Makefile +++ b/databases/postgresql-devel/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql7/Makefile +++ b/databases/postgresql7/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql73/Makefile +++ b/databases/postgresql73/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 748948761f9a..996534419d68 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -23,18 +23,19 @@ BROKEN=		doesn\'t build on the alpha yet  Y2K=		http://www.postgresql.org/y2k.html  # if you want to use the tcl/tk frontend pgaccess, then you need to build -# postgresql with tcl support by typing: make USE_TCL=yes -.if defined(USE_TCL) +# postgresql with tcl support by typing: make WITH_TCL=yes +.if defined(WITH_TCL)  TCL_INCDIR=	${LOCALBASE}/include/tcl8.0  TK_INCDIR=	${LOCALBASE}/include/tk8.0 -MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR} -LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 tk80.1:${PORTSDIR}/x11-toolkits/tk80 -WITH_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" +MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR} +LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \ +		tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"  .endif -# if you want jdbc, type make USE_JDBC=yes +# if you want jdbc, type make WITH_JDBC=yes  # Honors JAVA_HOME if you have it set, and don't want the dependency. -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  JAVA_HOME?=	${LOCALBASE}/jdk1.1.8  BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk  #MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} @@ -50,7 +51,8 @@ HAS_CONFIGURE=	YES  CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \  		--enable-locale \  		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ -		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \ +		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ +		${CONFIGURE_TCL} \  		--with-libraries=${PREFIX}/lib  INSTALL_TARGET= install install-man @@ -79,22 +81,20 @@ MANPREFIX=	${PREFIX}/pgsql  pre-fetch:  	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"  	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\"" -.if !defined(USE_TCL) +.if !defined(WITH_TCL)  	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:" -	@${ECHO_MSG} "    make USE_TCL=yes" +	@${ECHO_MSG} "    make WITH_TCL=yes"  .else  	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."  .endif - -.if !defined(USE_JDBC) +.if !defined(WITH_JDBC)  	@ ${ECHO_MSG} "To build Java (JDBC) support, type:" -	@ ${ECHO_MSG} "   make USE_JDBC=yes" +	@ ${ECHO_MSG} "   make WITH_JDBC=yes"  .else  	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."  .endif  post-patch: -  	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig  	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \  		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \ @@ -103,9 +103,8 @@ post-patch:  	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \  		${WRKSRC}/Makefile.global.in.old \  		>> ${WRKSRC}/Makefile.global.in -  # pgaccess (accidentally?) removed from distribution, so leave it for now -#.if defined(USE_TCL) +#.if defined(WITH_TCL)  #	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \  #		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig  #	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ @@ -114,14 +113,12 @@ post-patch:  #.endif  post-build: - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE}  .if !defined(NOPORTDOCS)  	@ cd ${WRKSRC}/interfaces/jdbc && ${GMAKE} examples  .endif  .endif -  	@ ${ECHO} "------------------------------------------------------------"  	@ ${ECHO} "Dump existing databases, before installing new db version !!"  	@ ${ECHO} "Detailed instructions, see" @@ -167,14 +164,12 @@ post-install:  	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh  	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql - -.if defined(USE_TCL) -	${CP} ${TMPPLIST} ${TMPPLIST}.notcl -	${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} -	${RM} ${TMPPLIST}.notcl +.if defined(WITH_TCL) +	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl +	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST} +	@${RM} ${TMPPLIST}.notcl  .endif - -.if defined(USE_JDBC) +.if defined(WITH_JDBC)  	@ ${MKDIR} -m 0555 ${PREFIX}/share/java  	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \  			  ${PREFIX}/share/java/postgresql.jar @@ -194,7 +189,6 @@ post-install:  	@ ${ECHO_MSG} "---------------------------------------------------------"  .endif  .endif -  .if !defined(NOPORTDOCS)  	${MKDIR} ${PREFIX}/share/doc/pgsql  	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc install | 
