diff options
115 files changed, 702 insertions, 852 deletions
diff --git a/archivers/linux_rar/Makefile b/archivers/linux_rar/Makefile index 3abcc048823..aa414e3cf77 100644 --- a/archivers/linux_rar/Makefile +++ b/archivers/linux_rar/Makefile @@ -41,7 +41,7 @@ post-fetch: pre-configure: @${ECHO_MSG} "To install unrar bundled with this package," - @${ECHO_MSG} "set variable WITH_UNRAR=YES." + @${ECHO_MSG} "set variable WITH_UNRAR=yes." do-install: @${MKDIR} ${PREFIX}/share/doc/rar ${PREFIX}/share/rar diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile index 9d0991f214c..c2407a493b3 100644 --- a/astro/xplanet/Makefile +++ b/astro/xplanet/Makefile @@ -27,37 +27,37 @@ MAN1= xplanet.1 xplanetbg.1 .include <bsd.port.pre.mk> -.if (!defined(USE_TK80) && !defined(USE_TK81) && !defined(USE_TK82) && !defined(USE_TK83)) +.if (!defined(WITH_TK80) && !defined(WITH_TK81) && !defined(WITH_TK82) && !defined(WITH_TK83)) .if exists(${LOCALBASE}/bin/wish8.3) -USE_TK83= yes +WITH_TK83= yes .elif exists(${LOCALBASE}/bin/wish8.2) -USE_TK82= yes +WITH_TK82= yes .elif exists(${LOCALBASE}/bin/wish8.1) -USE_TK81= yes +WITH_TK81= yes .else -USE_TK80= yes +WITH_TK80= yes .endif .endif -.if defined(USE_TK80) +.if defined(WITH_TK80) RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80 WISH= ${LOCALBASE}/bin/wish8.0 TKVERMSG= "Using Tk 8.0" .endif -.if defined(USE_TK81) +.if defined(WITH_TK81) RUN_DEPENDS= wish8.1:${PORTSDIR}/x11-toolkits/tk81 WISH= ${LOCALBASE}/bin/wish8.1 TKVERMSG= "Using Tk 8.1" .endif -.if defined(USE_TK82) +.if defined(WITH_TK82) RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82 WISH= ${LOCALBASE}/bin/wish8.2 TKVERMSG= "Using Tk 8.2" .endif -.if defined(USE_TK83) +.if defined(WITH_TK83) RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83 WISH= ${LOCALBASE}/bin/wish8.3 TKVERMSG= "Using Tk 8.3" @@ -67,7 +67,7 @@ CONFIGURE_ENV+= WISH=${WISH} pre-fetch: @${ECHO} ${TKVERMSG} - @${ECHO} "Define USE_TK80, USE_TK81, USE_TK82, or USE_Tk83" + @${ECHO} "Define WITH_TK80, WITH_TK81, WITH_TK82, or WITH_TK83" @${ECHO} "To use a different version of TK" pre-configure: diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile index b68ef02ef00..6961c8cf5b0 100644 --- a/audio/aumix/Makefile +++ b/audio/aumix/Makefile @@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR= apps/sound/mixers MAINTAINER= cpiazza@FreeBSD.org LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) LIB_DEPENDS+= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 GLIB_CONFIG= ${LOCALBASE}/bin/glib12-config @@ -35,12 +35,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GLIB_CONFIG="${GLIB_CONFIG}" \ GTK_CONFIG="${GTK_CONFIG}" \ LDFLAGS="-L${LOCALBASE}/lib" -.if defined(NO_X11) +.if defined(WITHOUT_X11) CONFIGURE_ARGS+= --without-gtk .else pre-fetch: @${ECHO_MSG} -n "To build this port without X11 (and without the GUI)," - @${ECHO_MSG} " define \"NO_X11\"." + @${ECHO_MSG} " define \"WITHOUT_X11\"." .endif .include <bsd.port.mk> diff --git a/audio/cdrdao/Makefile b/audio/cdrdao/Makefile index 7eace10ec83..4cff53d5260 100644 --- a/audio/cdrdao/Makefile +++ b/audio/cdrdao/Makefile @@ -4,10 +4,6 @@ # # $FreeBSD$ # -# If you don't want to use Joerg Schilling's SCSI library, -# set DONT_USE_SCGLIB = yes -# If you don't want to use pthreads, set DONT_USE_PTHREADS = yes -# If you want the graphical X toc file editor, set XCDRDAO = yes PORTNAME= cdrdao PORTVERSION= 1.1.3 @@ -45,18 +41,21 @@ PLIST=${PKGDIR}/PLIST.xcdrdao CONFIGURE_ARGS= --disable-gtkmmtest .endif -.if defined(DONT_USE_SCGLIB) && ${OSVERSION} > 300000 +.if defined(WITHOUT_SCGLIB) && ${OSVERSION} > 300000 CONFIGURE_ARGS+= --without-scglib .endif -.if defined(DONT_USE_PTHREADS) && ${OSVERSION} > 320000 +.if defined(WITHOUT_PTHREADS) && ${OSVERSION} > 320000 CONFIGURE_ARGS+= --without-posix-threads .endif pre-fetch: + @${ECHO_MSG} "If you don't want to use Joerg Schilling's SCSI library," + @${ECHO_MSG} "set WITHOUT_SCGLIB=yes." + @${ECHO_MSG} "If you don't want to use pthreads, set WITHOUT_PTHREADS=yes." .if !defined(XCDRDAO) @${ECHO_MSG} "To build the graphical X toc file editor, xcdrdao, type:" - @${ECHO_MSG} " make XCDRDAO=yes" + @${ECHO_MSG} " make XCDRDAO=yes." .else @${ECHO_MSG} "Building with xcdrdao" .endif diff --git a/audio/lame/Makefile b/audio/lame/Makefile index 3316929728b..9961f416ce3 100644 --- a/audio/lame/Makefile +++ b/audio/lame/Makefile @@ -16,7 +16,7 @@ PATCHFILES= lame3.51.patch.gz MAINTAINER= yoshiaki@kt.rim.or.jp -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 .endif @@ -24,7 +24,7 @@ PATCH_DIST_STRIP = -p1 WRKSRC= ${WRKDIR}/dist10/lsf/encoder/ USE_GMAKE= YES -MAKE_ENV= NO_X11=${NO_X11} +MAKE_ENV= WITHOUT_X11=${WITHOUT_X11} ALL_TARGET= lame RESTRICTED= Condition is not clear diff --git a/audio/lame/files/patch-aa b/audio/lame/files/patch-aa index 4bd8ef8510c..779df763a85 100644 --- a/audio/lame/files/patch-aa +++ b/audio/lame/files/patch-aa @@ -13,7 +13,7 @@ ########################################################################## ifeq ($(UNAME),FreeBSD) # remove if you do not have GTK or do not want the GTK frame analyzer -+ifndef NO_X11 ++ifndef WITHOUT_X11 GTK = -DHAVEGTK `gtk12-config --cflags` GTKLIBS = `gtk12-config --libs` +endif diff --git a/audio/replay/Makefile b/audio/replay/Makefile index 6413ab593e0..90d051c9ba5 100644 --- a/audio/replay/Makefile +++ b/audio/replay/Makefile @@ -26,15 +26,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -.if defined(USE_I18N) +.if defined(WITH_I18N) CONFIGURE_ARGS+= --enable-i18n=JAPANESE .endif pre-configure: -.if !defined(USE_I18N) +.if !defined(WITH_I18N) @${ECHO_MSG} @${ECHO_MSG} "If you would like build replay with I18N support" - @${ECHO_MSG} "you must set the variable USE_I18N" + @${ECHO_MSG} "you must set the variable WITH_I18N" @${ECHO_MSG} "(Now JAPANESE only)" @${ECHO_MSG} .else diff --git a/audio/sox/Makefile b/audio/sox/Makefile index c28f15fb212..986d1f40677 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -18,7 +18,7 @@ MLINKS= play.1 rec.1 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fast-ulaw --enable-fast-alaw --with-oss-dsp -.if defined(USE_GSM) +.if defined(WITH_GSM) CONFIGURE_ARGS+= --with-gsmlib=${PREFIX}/lib --with-gsminc=${PREFIX}/include LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm .endif diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile index b1aafdfdc92..7b22d0f903e 100644 --- a/audio/timidity++/Makefile +++ b/audio/timidity++/Makefile @@ -13,12 +13,12 @@ DISTNAME= TiMidity++-${PORTVERSION} MAINTAINER= yatt@msc.biglobe.ne.jp -# If you don't have X11, type "make -DNO_X11" or uncomment this. -#NO_X11= yes +# If you don't have X11, type "make -DWITHOUT_X11" or uncomment this. +#WITHOUT_X11= yes USE_BZIP2= yes GNU_CONFIGURE= yes -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) USE_XLIB= yes LIB_DEPENDS+= png.3:${PORTSDIR}/graphics/png .endif @@ -26,7 +26,7 @@ LIB_DEPENDS+= png.3:${PORTSDIR}/graphics/png DIST_SUBDIR= timidity INSTALL_TARGET= install install.man -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x --enable-ncurses --enable-vt100 \ --enable-dynamic --enable-server \ --enable-network --enable-spectrogram --enable-wrd @@ -35,7 +35,7 @@ CONFIGURE_ARGS= --enable-ncurses --enable-vt100 \ --enable-network --disable-spectrogram --disable-wrd .endif -.if defined(USE_ESOUND) +.if defined(WITH_ESOUND) LIB_DEPENDS+= esd.2:${PORTSDIR}/audio/esound CONFIGURE_ARGS+= --enable-audio=oss,esd .else diff --git a/audio/wmtune/Makefile b/audio/wmtune/Makefile index e5bec7a8acb..7defa343431 100644 --- a/audio/wmtune/Makefile +++ b/audio/wmtune/Makefile @@ -26,12 +26,12 @@ PATCH_ARGS =-p0 -d ${WRKDIR} .include <bsd.port.pre.mk> -.if !defined(USE_RADIOTRACK) +.if !defined(WITH_RADIOTRACK) WMTUNE_DIFF= wmtune.diff.gz pre-fetch: @${ECHO} @${ECHO} "To enable support for RadioTrack radio cards," - @${ECHO} "define USE_RADIOTRACK (make USE_RADIOTRACK=yes)." + @${ECHO} "define WITH_RADIOTRACK (make WITH_RADIOTRACK=yes)." @${ECHO} @sleep 3 .else diff --git a/cad/mars/Makefile b/cad/mars/Makefile index ef9acee2406..276cea59f2f 100644 --- a/cad/mars/Makefile +++ b/cad/mars/Makefile @@ -21,7 +21,7 @@ NO_WRKSUBDIR= yes EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} .if defined(HAVE_MOTIF) && !defined(PACKAGE_BUILDING) MAKEFILE= Makefile.XMotif -.elif defined(WITH_X) && (${WITH_X} == NO || ${WITH_X} == no) +.elif defined(WITHOUT_X11) MAKEFILE= Makefile.NoX .else USE_XLIB= yes diff --git a/chinese/xemacs/Makefile b/chinese/xemacs/Makefile index b6a86fa1eff..8ea6d9c2e5f 100644 --- a/chinese/xemacs/Makefile +++ b/chinese/xemacs/Makefile @@ -28,7 +28,6 @@ HAS_CONFIGURE= yes XEMACS_ARCH= ${MACHINE_ARCH}--freebsd CONFIGURE_ARGS= ${XEMACS_ARCH} --prefix=${PREFIX} \ --with-mule \ - ${WITH_XIM} \ --with-xfs \ --with-clash-detection \ --lockdir=/var/run/emacs/lock \ @@ -36,20 +35,16 @@ CONFIGURE_ARGS= ${XEMACS_ARCH} --prefix=${PREFIX} \ --site-includes=${PREFIX}/include \ --site-libraries=${PREFIX}/lib \ --sitelispdir="${PREFIX}/lib/xemacs/site-lisp ${PREFIX}/share/emacs/site-lisp" \ - --with-session=yes \ - ${WITH_MENUBARS} ${WITH_DIALOGS} \ - ${WITH_XFACE} ${WITH_OFFIX} + --with-session=yes MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \ gnuserv.1 xemacs.1 ALL_TARGET= all dist PLIST_SUB= XEMACS_VER=20.4 XEMACS_ARCH=${XEMACS_ARCH} .if defined(REAL_MOTIF) -WITH_MENUBARS= --with-menubars=lucid -WITH_XIM= --with-xim=motif +CONFIGURE_ARGS+= --with-menubars=lucid --with-xim=motif .else -WITH_MENUBARS= --with-menubars=lucid -WITH_XIM= --with-xim=xlib +CONFIGURE_ARGS+= --with-menubars=lucid --with-xim=xlib .endif # Have @@ -69,14 +64,13 @@ pre-configure: # hack to avoid shipping binaries linked with Motif .if defined(MOTIF_STATIC) -WITH_DIALOGS= --with-dialogs=athena +CONFIGURE_ARGS+= --with-dialogs=athena .endif # Drop faces (libcompface) and offix (libDnd) if building package, # autodetect otherwise .if defined(PACKAGE_BUILDING) -WITH_XFACE?= --with-xface=no -WITH_OFFIX?= --with-offix=no +CONFIGURE_ARGS+= --with-xface=no --with-offix=no .endif post-install: diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index 7602a28e2ac..be3ed04a894 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 748948761f9..996534419d6 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 748948761f9..996534419d6 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 748948761f9..996534419d6 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 748948761f9..996534419d6 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 748948761f9..996534419d6 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 748948761f9..996534419d6 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 748948761f9..996534419d6 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 748948761f9..996534419d6 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 748948761f9..996534419d6 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 748948761f9..996534419d6 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 748948761f9..996534419d6 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 748948761f9..996534419d6 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 748948761f9..996534419d6 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 748948761f9..996534419d6 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 diff --git a/deskutils/gaddr/Makefile b/deskutils/gaddr/Makefile index 47a1c3dad13..45fe98e724b 100644 --- a/deskutils/gaddr/Makefile +++ b/deskutils/gaddr/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.cse.unl.edu/~cluening/gaddr/ MAINTAINER= jim@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -.if defined(USE_GNOME) +.if defined(WITH_GNOME) LIB_DEPENDS+= gnome.3:${PORTSDIR}/x11/gnomelibs .endif @@ -22,7 +22,7 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes GNU_CONFIGURE= yes -.if defined(USE_GNOME) +.if defined(WITH_GNOME) CONFIGURE_ARGS+= --enable-gnome .endif diff --git a/devel/glade/Makefile b/devel/glade/Makefile index baab79372d3..b6d0cb7d32e 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -12,7 +12,7 @@ MASTER_SITES= http://glade.pn.org/ MAINTAINER= ade@FreeBSD.org -.if defined(USE_GNOME) +.if defined(WITH_GNOME) LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs PLIST_GNOME= ${PKGDIR}/PLIST.gnome .else @@ -32,13 +32,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/libs" -.if !defined(USE_GNOME) +.if !defined(WITH_GNOME) pre-extract: - @${ECHO} "You can add hooks for GNOME by defining USE_GNOME" + @${ECHO} "You can add hooks for GNOME by defining WITH_GNOME" .endif post-patch: -.if !defined(USE_GNOME) +.if !defined(WITH_GNOME) @cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-nognome .endif diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile index baab79372d3..b6d0cb7d32e 100644 --- a/devel/glade2/Makefile +++ b/devel/glade2/Makefile @@ -12,7 +12,7 @@ MASTER_SITES= http://glade.pn.org/ MAINTAINER= ade@FreeBSD.org -.if defined(USE_GNOME) +.if defined(WITH_GNOME) LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs PLIST_GNOME= ${PKGDIR}/PLIST.gnome .else @@ -32,13 +32,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/libs" -.if !defined(USE_GNOME) +.if !defined(WITH_GNOME) pre-extract: - @${ECHO} "You can add hooks for GNOME by defining USE_GNOME" + @${ECHO} "You can add hooks for GNOME by defining WITH_GNOME" .endif post-patch: -.if !defined(USE_GNOME) +.if !defined(WITH_GNOME) @cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-nognome .endif diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 60e08c91761..dc8a0f0014a 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -22,7 +22,7 @@ MAINTAINER= will@FreeBSD.org LIB_DEPENDS= kdeui.3:${PORTSDIR}/x11/kdelibs11 RUN_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf -.if defined(USE_OPTIONAL_DEPENDS) +.if defined(WITH_OPTIONAL_DEPENDS) RUN_DEPENDS+= automake:${PORTSDIR}/devel/automake \ kdbg:${PORTSDIR}/devel/kdbg \ ${LOCALBASE}/share/doc/HTML/en/kdelibs/kdecore/index.html:${PORTSDIR}/devel/kdelibdocs \ @@ -45,9 +45,9 @@ SOMAJOR= 1 PLIST_SUB+= LIBVER="${SOMAJOR}" pre-patch: -.if !defined(USE_OPTIONAL_DEPENDS) +.if !defined(WITH_OPTIONAL_DEPENDS) @${ECHO} - @${ECHO} "You may define USE_OPTIONAL_DEPENDS (make USE_OPTIONAL_DEPENDS=YES)" + @${ECHO} "You may define WITH_OPTIONAL_DEPENDS (make WITH_OPTIONAL_DEPENDS=YES)" @${ECHO} "to automatically build the suggested programs to compliment kdevelop." @${ECHO} @sleep 1 diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile index 0181694e9ee..6b150e3c1d0 100644 --- a/devel/tclreadline/Makefile +++ b/devel/tclreadline/Makefile @@ -18,21 +18,21 @@ MANN= tclreadline.n .include <bsd.port.pre.mk> -.if (!defined(USE_TCL80) && !defined(USE_TCL82)) +.if (!defined(WITH_TCL80) && !defined(WITH_TCL82)) .if exists(${PREFIX}/bin/tclsh8.0) -USE_TCL80= YES +WITH_TCL80= yes .else -USE_TCL82= YES +WITH_TCL82= yes .endif .endif -.if defined(USE_TCL80) +.if defined(WITH_TCL80) LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80 CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.0 --with-tcl-includes=${PREFIX}/include/tcl8.0 TCLVERMSG= "Building for Tcl 8.0" .endif -.if defined(USE_TCL82) +.if defined(WITH_TCL82) LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.2 --with-tcl-includes=${PREFIX}/include/tcl8.2 TCLVERMSG= "Building for Tcl 8.2" @@ -40,7 +40,7 @@ TCLVERMSG= "Building for Tcl 8.2" pre-fetch: @${ECHO} ${TCLVERMSG} - @${ECHO} "Define USE_TCL80, or USE_TCL82" + @${ECHO} "Define WITH_TCL80, or WITH_TCL82" @${ECHO} "To compile against a different version of TCL" .include <bsd.port.post.mk> diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile index 16a0dc773b7..949b2ef16bf 100644 --- a/editors/elvis/Makefile +++ b/editors/elvis/Makefile @@ -20,13 +20,13 @@ CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/elvis MAN1= elvis.1 elvtags.1 ref.1 # Support building on systems with or without X11 installed. -.if defined(NO_X11) +.if defined(WITHOUT_X11) CONFIGURE_ARGS+= --with-x=no .else USE_XLIB= yes pre-fetch: - @${ECHO_MSG} "To build this port without X11, define \"NO_X11\"." + @${ECHO_MSG} "To build this port without X11, define \"WITHOUT_X11\"." .endif pre-configure: diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index fd21bc2971a..2aa74d63a90 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -22,7 +22,7 @@ NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/emacs-19.34 GNU_CONFIGURE= yes USE_GMAKE= yes -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --sharedstatedir=/var/run USE_XLIB= yes .else diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile index fd21bc2971a..2aa74d63a90 100644 --- a/editors/emacs19/Makefile +++ b/editors/emacs19/Makefile @@ -22,7 +22,7 @@ NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/emacs-19.34 GNU_CONFIGURE= yes USE_GMAKE= yes -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --sharedstatedir=/var/run USE_XLIB= yes .else diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile index ca41aab9bd4..ee6f7a1243f 100644 --- a/editors/emacs20-dl/Makefile +++ b/editors/emacs20-dl/Makefile @@ -28,7 +28,7 @@ USE_GMAKE= yes MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" EMACS_VER= 20.6 CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --with-pop USE_XLIB= yes .else @@ -43,11 +43,9 @@ PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET} \ SCRIPTS_ENV= SED=${SED} MV=${MV} \ DOC_FILE=${DOC_FILE} -.if defined(USE_XPG4) -.if (${USE_XPG4} == "YES" || ${USE_XPG4} == "yes") +.if defined(WITH_XPG4) CONFIGURE_ARGS+= --with-xpg4 .endif -.endif pre-build: @${RM} -rf ${WRKSRC}/info/* diff --git a/editors/emacs20-dl/pkg-descr b/editors/emacs20-dl/pkg-descr index cc0bd59dcd7..76e86dd7690 100644 --- a/editors/emacs20-dl/pkg-descr +++ b/editors/emacs20-dl/pkg-descr @@ -15,7 +15,7 @@ warning message may be displayed: Warning: locale not supported by C library, locale unchanged -If you complain about this message, type `make install USE_XPG4=YES' +If you complain about this message, type `make install WITH_XPG4=yes' at the "${PORTSDIR}/editors/japanese" directory to re-make this package. WWW: http://www.m17n.org/mule/dynamic-loading/ diff --git a/editors/emacs20-dl/pkg-message b/editors/emacs20-dl/pkg-message index 7beccddf923..fcc358a279c 100644 --- a/editors/emacs20-dl/pkg-message +++ b/editors/emacs20-dl/pkg-message @@ -7,7 +7,7 @@ Warning: locale not supported by C library, locale unchanged - If you complain about this message, type `make install USE_XPG4=YES' + If you complain about this message, type `make install WITH_XPG4=yes' at the "${PORTSDIR}/editors/emacs20-dl" directory to re-make this package. **************************************************************************** diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 3640b925ea0..fb51927f9cd 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -18,7 +18,7 @@ Y2K= http://www.gnu.org/software/year2000.html USE_AUTOCONF= yes USE_GMAKE= yes CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --with-pop USE_XLIB= yes .else @@ -30,16 +30,14 @@ MAN1= emacs.1 etags.1 ctags.1 PLIST_SUB= EMACS_VER=20.6 EMACS_ARCH=${CONFIGURE_TARGET} WRKSRC= ${WRKDIR}/emacs-20.6 -.if defined(USE_XPG4) -.if (${USE_XPG4} == "YES" || ${USE_XPG4} == "yes") +.if defined(WITH_XPG4) CONFIGURE_ARGS+= --with-xpg4 .endif -.endif pre-fetch: -.if !defined(USE_XPG4) +.if !defined(WITH_XPG4) @${ECHO_MSG} "NOTE: You can have international locale library support " - @${ECHO_MSG} "by adding \"USE_XPG4=YES\" to argument of make." + @${ECHO_MSG} "by adding \"WITH_XPG4=yes\" to argument of make." .endif pre-build: diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile index fd21bc2971a..2aa74d63a90 100644 --- a/editors/emacs22/Makefile +++ b/editors/emacs22/Makefile @@ -22,7 +22,7 @@ NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/emacs-19.34 GNU_CONFIGURE= yes USE_GMAKE= yes -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --sharedstatedir=/var/run USE_XLIB= yes .else diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index fd21bc2971a..2aa74d63a90 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -22,7 +22,7 @@ NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/emacs-19.34 GNU_CONFIGURE= yes USE_GMAKE= yes -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --sharedstatedir=/var/run USE_XLIB= yes .else diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/staroffice5/Makefile b/editors/staroffice5/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/staroffice5/Makefile +++ b/editors/staroffice5/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/staroffice52/Makefile +++ b/editors/staroffice52/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/staroffice60/Makefile +++ b/editors/staroffice60/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/editors/staroffice70/Makefile +++ b/editors/staroffice70/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/vile/Makefile b/editors/vile/Makefile index 2c64484c4e0..54bb3ba6e94 100644 --- a/editors/vile/Makefile +++ b/editors/vile/Makefile @@ -18,15 +18,15 @@ MAKEFILE= makefile GNU_CONFIGURE= yes MAN1= vile.1 -.if defined(USE_PERL) +.if defined(WITH_PERL) CONFIGURE_ARGS= --with-perl PLIST= ${PKGDIR}/PLIST.perl USE_PERL5= yes .endif pre-configure: -.if ! defined(USE_PERL) - @${ECHO_MSG} "Define USE_PERL if you want to make a vile which includes" +.if ! defined(WITH_PERL) + @${ECHO_MSG} "Define WITH_PERL if you want to make a vile which includes" @${ECHO_MSG} "PERL functionality" .endif @@ -38,7 +38,7 @@ post-install: @if ! [ -d ${PREFIX}/share/vile/macros ]; then ${MKDIR} ${PREFIX}/share/vile/macros; fi ${INSTALL_DATA} ${WRKSRC}/macros/*.rc ${PREFIX}/share/vile/macros ${INSTALL_SCRIPT} ${WRKSRC}/macros/vile-pager ${PREFIX}/share/vile/macros -.if defined(USE_PERL) +.if defined(WITH_PERL) ${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/vile .endif @${ECHO_MSG} "Look in ${PREFIX}/share/doc/vile for documentation." diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile index c026c81f435..a13f4ccec6c 100644 --- a/editors/xemacs20/Makefile +++ b/editors/xemacs20/Makefile @@ -43,7 +43,7 @@ PLIST_SUB= XEMACS_VER=20.4 XEMACS_ARCH=${XEMACS_ARCH} # Have pre-configure: - @${ECHO_MSG} "To compile in the MULE features, set the environment variable USE_MULE" + @${ECHO_MSG} "To compile in the MULE features, set the environment variable WITH_MULE" .if defined(HAVE_MOTIF) @${ECHO_MSG} "" @${ECHO_MSG} "If your MOTIF library is actually lesstif, you might occasionally" @@ -52,7 +52,7 @@ pre-configure: @${ECHO_MSG} "which will force the use of athena widgets for dialogs." .endif -.if defined(USE_MULE) +.if defined(WITH_MULE) WITH_MULE= --with-mule MULEDISTFILE= ${DISTNAME}-mule.tar.gz PLIST= ${PKGDIR}/PLIST.mule diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index b6395d99e5e..07a75be6611 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -18,25 +18,24 @@ MAINTAINER= gj@freebsd.org USE_XLIB= yes MAKEFILE= makefile GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-screen=${SCREEN_TYPE} ${WITH_PERL} MAN1= xvile.1 pre-configure: -.if ! defined(USE_MENUS) - @${ECHO_MSG} "To use xvile with menus, set the environment variable USE_MENUS" +.if ! defined(WITH_MENUS) + @${ECHO_MSG} "To use xvile with menus, set the environment variable WITH_MENUS" .endif -.if ! defined(USE_PERL) - @${ECHO_MSG} "To use xvile with PERL, set the environment variable USE_PERL" +.if ! defined(WITH_PERL) + @${ECHO_MSG} "To use xvile with PERL, set the environment variable WITH_PERL" .endif -.if defined(USE_MENUS) -SCREEN_TYPE= Xaw +.if defined(WITH_MENUS) +CONFIGURE_ARGS= --with-screen=Xaw .else -SCREEN_TYPE= x11 +CONFIGURE_ARGS= --with-screen=x11 .endif -.if defined(USE_PERL) -WITH_PERL= --with-perl +.if defined(WITH_PERL) +CONFIGURE_ARGS+= --with-perl PLIST= ${PKGDIR}/PLIST.perl USE_PERL5= yes .endif @@ -49,7 +48,7 @@ post-install: @if ! [ -d ${PREFIX}/share/vile/macros ]; then ${MKDIR} ${PREFIX}/share/vile/macros; fi ${INSTALL_DATA} ${WRKSRC}/macros/*.rc ${PREFIX}/share/vile/macros ${INSTALL_SCRIPT} ${WRKSRC}/macros/vile-pager ${PREFIX}/share/vile/macros -.if defined(USE_PERL) +.if defined(WITH_PERL) ${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/vile .endif @${ECHO_MSG} "Look in ${PREFIX}/share/doc/vile for documentation." diff --git a/emulators/quasi88/Makefile b/emulators/quasi88/Makefile index a3f2e5bf073..5ec5ae0caa9 100644 --- a/emulators/quasi88/Makefile +++ b/emulators/quasi88/Makefile @@ -19,14 +19,14 @@ USE_GMAKE= yes DATAFILES= FAQ FORMAT GET-IMAGE HELP HISTORY LIST MANUAL QUASI88 pre-patch: -.if !defined(USE_SOUND) - @ ${ECHO} "You can make quasi88 use sound by defining USE_SOUND" +.if !defined(WITH_SOUND) + @ ${ECHO} "You can make quasi88 use sound by defining WITH_SOUND" .else @ ${CP} ${FILESDIR}/patch-aa ${PATCHDIR} .endif post-patch: -.if defined(USE_SOUND) +.if defined(WITH_SOUND) @ ${RM} ${PATCHDIR}/patch-aa .endif diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 2e3fd4b14cf..56618c43d39 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -17,7 +17,7 @@ MASTER_SITES= http://curl.haxx.nu/stuff/ \ MAINTAINER= kris@FreeBSD.org -.if defined(USE_SSL) +.if defined(WITH_SSL) USE_OPENSSL= RSA .endif diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile index 5195d1298d2..542e42078f4 100644 --- a/ftp/pavuk/Makefile +++ b/ftp/pavuk/Makefile @@ -20,7 +20,7 @@ MAINTAINER= ports@FreeBSD.org USE_AUTOCONF= yes -.if defined(NO_X11) +.if defined(WIITHOUT_X11) CONFIGURE_ARGS= --disable-gtk .else CONFIGURE_ARGS= --with-xpm-includes=${X11BASE}/include --disable-gtk @@ -29,7 +29,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm USE_GMAKE= yes -.if defined(USE_SSL) +.if defined(WITH_SSL) USE_OPENSSL= RSA .else CONFIGURE_ARGS+= --disable-ssl diff --git a/games/acm/Makefile b/games/acm/Makefile index ddb5dca8faf..8b6339b5d0e 100644 --- a/games/acm/Makefile +++ b/games/acm/Makefile @@ -20,9 +20,8 @@ MAN6= acm.6 .include <bsd.port.pre.mk> # Include sound support (Use network audio server (nas)) -.if defined(USE_SOUND) && ${USE_SOUND} == YES || \ - exists(${PREFIX}/lib/libaudio.a) && \ - (!defined(USE_SOUND) || ${USE_SOUND} != NO) +.if defined(WITH_SOUND) || (exists(${PREFIX}/lib/libaudio.a) \ + && !defined(WITHOUT_SOUND)) LIB_DEPENDS+= audio.7:${PORTSDIR}/audio/nas .endif diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile index d93cf115709..bc8adb1b600 100644 --- a/games/freeciv-gtk2/Makefile +++ b/games/freeciv-gtk2/Makefile @@ -10,20 +10,20 @@ PORTVERSION= 1.10.0 CATEGORIES= games MASTER_SITES= ftp://ftp.freeciv.org/pub/freeciv/stable_version/ \ ftp://ftp.pvv.ntnu.no/pub/freeciv/stable_version/ -.if defined(USE_GTK) && (${USE_GTK} == YES || ${USE_GTK} == yes) +.if defined(WITH_GTK) PKGNAMESUFFIX= -gtk .endif MAINTAINER= sheldonh@freebsd.org LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm -.if defined(USE_GTK) +.if defined(WITH_GTK) LIB_DEPENDS+= Imlib.5:${PORTSDIR}/graphics/imlib .endif USE_BZIP2= yes GNU_CONFIGURE= yes -.if defined(USE_GTK) && (${USE_GTK} == YES || ${USE_GTK} == yes) +.if defined(WITH_GTK) GTK_CONFIG?= ${X11BASE}/bin/gtk12-config CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" .else diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index d93cf115709..bc8adb1b600 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -10,20 +10,20 @@ PORTVERSION= 1.10.0 CATEGORIES= games MASTER_SITES= ftp://ftp.freeciv.org/pub/freeciv/stable_version/ \ ftp://ftp.pvv.ntnu.no/pub/freeciv/stable_version/ -.if defined(USE_GTK) && (${USE_GTK} == YES || ${USE_GTK} == yes) +.if defined(WITH_GTK) PKGNAMESUFFIX= -gtk .endif MAINTAINER= sheldonh@freebsd.org LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm -.if defined(USE_GTK) +.if defined(WITH_GTK) LIB_DEPENDS+= Imlib.5:${PORTSDIR}/graphics/imlib .endif USE_BZIP2= yes GNU_CONFIGURE= yes -.if defined(USE_GTK) && (${USE_GTK} == YES || ${USE_GTK} == yes) +.if defined(WITH_GTK) GTK_CONFIG?= ${X11BASE}/bin/gtk12-config CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" .else diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index 5b6d7de47b6..75fca68463b 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -14,7 +14,7 @@ DISTNAME= quakeforge MAINTAINER= darius@dons.net.au -.if defined(USE_GLX) +.if defined(WITH_GLX) LIB_DEPENDS= GL.1:${PORTSDIR}/graphics/glx .else CONFIGURE_ARGS+= --without-opengl @@ -38,8 +38,8 @@ USE_XLIB= yes PLIST= ${WRKDIR}/PLIST pre-fetch: -.if !defined(USE_GLX) - @${ECHO_MSG} "Define USE_GLX to use GLX (otherwise it is explicitly disabled!)" +.if !defined(WITH_GLX) + @${ECHO_MSG} "Define WITH_GLX to use GLX (otherwise it is explicitly disabled!)" .endif .if defined(BATCH) @@ -125,14 +125,14 @@ do-extract: pre-configure: @${CP} ${PKGDIR}/PLIST ${PLIST} -.if defined(USE_GLX) +.if defined(WITH_GLX) ${CAT} ${PKGDIR}/PLIST.glx >>${PLIST} .endif cd ${WRKSRC}; \ autoheader; BINARIES= quake-x11 qw-client-x11 qw-server -.if defined(USE_GLX) +.if defined(WITH_GLX) BINARIES+= quake-gl qw-client-gl .endif diff --git a/german/staroffice5/Makefile b/german/staroffice5/Makefile index e451d1beac1..e8803cfa666 100644 --- a/german/staroffice5/Makefile +++ b/german/staroffice5/Makefile @@ -33,18 +33,18 @@ WRKSRC= ${WRKDIR}/so51inst .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(${CD_MOUNTPT}/linux/office51/setup.zip) IGNORE= "Bitte mounten Sie die Sun StarOffice 5.1 CDROM and starten Sie make erneut." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Bitte laden Sie ${DISTNAME}${EXTRACT_SUFX} manuell von http://www.sun.com/staroffice herunter. Kopieren Sie ${DISTNAME}${EXTRACT_SUFX} in das Verzeichnis ${_DISTDIR} und starten Sie make erneut. Wenn Sie die StarOffice 5.1 CDROM besitzen, koennen Sie auch 'make USE_CDROM=yes' ausfuehren." +IGNORE="Bitte laden Sie ${DISTNAME}${EXTRACT_SUFX} manuell von http://www.sun.com/staroffice herunter. Kopieren Sie ${DISTNAME}${EXTRACT_SUFX} in das Verzeichnis ${_DISTDIR} und starten Sie make erneut. Wenn Sie die StarOffice 5.1 CDROM besitzen, koennen Sie auch 'make WITH_CDROM=yes' ausfuehren." .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s ${CD_MOUNTPT}/linux/office51/* . diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile index e451d1beac1..e8803cfa666 100644 --- a/german/staroffice52/Makefile +++ b/german/staroffice52/Makefile @@ -33,18 +33,18 @@ WRKSRC= ${WRKDIR}/so51inst .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(${CD_MOUNTPT}/linux/office51/setup.zip) IGNORE= "Bitte mounten Sie die Sun StarOffice 5.1 CDROM and starten Sie make erneut." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Bitte laden Sie ${DISTNAME}${EXTRACT_SUFX} manuell von http://www.sun.com/staroffice herunter. Kopieren Sie ${DISTNAME}${EXTRACT_SUFX} in das Verzeichnis ${_DISTDIR} und starten Sie make erneut. Wenn Sie die StarOffice 5.1 CDROM besitzen, koennen Sie auch 'make USE_CDROM=yes' ausfuehren." +IGNORE="Bitte laden Sie ${DISTNAME}${EXTRACT_SUFX} manuell von http://www.sun.com/staroffice herunter. Kopieren Sie ${DISTNAME}${EXTRACT_SUFX} in das Verzeichnis ${_DISTDIR} und starten Sie make erneut. Wenn Sie die StarOffice 5.1 CDROM besitzen, koennen Sie auch 'make WITH_CDROM=yes' ausfuehren." .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s ${CD_MOUNTPT}/linux/office51/* . diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile index cbe4b941e92..2714cfc1bfa 100644 --- a/german/staroffice70/Makefile +++ b/german/staroffice70/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index 1b82b377b7c..41c6bd9a38c 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -15,14 +15,14 @@ MAINTAINER= ports@FreeBSD.org USE_AUTOCONF= yes USE_LIBTOOL= yes +.include <bsd.port.pre.mk> + # # Support for X11 is compiled in by default only if X11 is installed. # -.if !exists(${X11BASE}) -NO_X11?= yes -.endif -.if !defined(NO_X11) -USE_XLIB=YES +.if defined(WITH_X11) || (exists(${X11BASE}/lib/libX11.a) \ + && !defined(WITHOUT_X11)) +USE_XLIB= yes CONFIGURE_ARGS= --with-x --x-includes="${X11BASE}/include" \ --x-libraries="${X11BASE}/lib" .else @@ -32,7 +32,4 @@ CONFIGURE_ARGS= --with-x11-driver=no post-patch: @${PERL} -pi -e "s:/usr/local:${LOCALBASE}:g;" ${WRKSRC}/configure.in -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 71ae522dc0c..18cfb206320 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -15,7 +15,7 @@ MAINTAINER= billf@FreeBSD.org LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg -.if defined(WANT_X11) +.if defined(WITH_X11) LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \ Xpm.4:${PORTSDIR}/graphics/xpm @@ -23,9 +23,9 @@ USE_XLIB= YES .endif pre-fetch: -.if !defined(WANT_X11) +.if !defined(WITH_X11) @${ECHO} -n "If you want to compile in X support use " - @${ECHO} "'make -DWANT_X11' instead" + @${ECHO} "'make -DWITH_X11' instead" .endif pre-install: diff --git a/graphics/gd/files/patch-ac b/graphics/gd/files/patch-ac index de989ae7c0e..451bf86d46b 100644 --- a/graphics/gd/files/patch-ac +++ b/graphics/gd/files/patch-ac @@ -24,7 +24,7 @@ #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a #variation of this and comment out the line above. See also LIBS below. -#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF -+.if defined(WANT_X11) ++.if defined(WITH_X11) +CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +.else +CFLAGS+=-DHAVE_JPEG @@ -39,7 +39,7 @@ #variation of this and comment out the line above. Note that #Xpm requires X11. See also CFLAGS above. -#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -+.if defined(WANT_X11) ++.if defined(WITH_X11) +LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +.endif @@ -47,7 +47,7 @@ #If yours are somewhere else, change this. -INCLUDEDIRS=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11 +CFLAGS+=-I$(LOCALBASE)/include -+.if defined(WANT_X11) ++.if defined(WITH_X11) +CFLAGS+=-I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11 +.endif @@ -59,7 +59,7 @@ #on your system can't cause conflicts while building a new one. -LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib +LIBDIRS=-L. -L$(LOCALBASE)/lib -+.if defined(WANT_X11) ++.if defined(WITH_X11) +LIBDIRS+=-L$(X11BASE)/lib +.endif diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile index 71ae522dc0c..18cfb206320 100644 --- a/graphics/gd1/Makefile +++ b/graphics/gd1/Makefile @@ -15,7 +15,7 @@ MAINTAINER= billf@FreeBSD.org LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg -.if defined(WANT_X11) +.if defined(WITH_X11) LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \ Xpm.4:${PORTSDIR}/graphics/xpm @@ -23,9 +23,9 @@ USE_XLIB= YES .endif pre-fetch: -.if !defined(WANT_X11) +.if !defined(WITH_X11) @${ECHO} -n "If you want to compile in X support use " - @${ECHO} "'make -DWANT_X11' instead" + @${ECHO} "'make -DWITH_X11' instead" .endif pre-install: diff --git a/graphics/gd1/files/patch-ac b/graphics/gd1/files/patch-ac index de989ae7c0e..451bf86d46b 100644 --- a/graphics/gd1/files/patch-ac +++ b/graphics/gd1/files/patch-ac @@ -24,7 +24,7 @@ #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a #variation of this and comment out the line above. See also LIBS below. -#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF -+.if defined(WANT_X11) ++.if defined(WITH_X11) +CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +.else +CFLAGS+=-DHAVE_JPEG @@ -39,7 +39,7 @@ #variation of this and comment out the line above. Note that #Xpm requires X11. See also CFLAGS above. -#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -+.if defined(WANT_X11) ++.if defined(WITH_X11) +LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +.endif @@ -47,7 +47,7 @@ #If yours are somewhere else, change this. -INCLUDEDIRS=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11 +CFLAGS+=-I$(LOCALBASE)/include -+.if defined(WANT_X11) ++.if defined(WITH_X11) +CFLAGS+=-I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11 +.endif @@ -59,7 +59,7 @@ #on your system can't cause conflicts while building a new one. -LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib +LIBDIRS=-L. -L$(LOCALBASE)/lib -+.if defined(WANT_X11) ++.if defined(WITH_X11) +LIBDIRS+=-L$(X11BASE)/lib +.endif diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile index 71ae522dc0c..18cfb206320 100644 --- a/graphics/gd2/Makefile +++ b/graphics/gd2/Makefile @@ -15,7 +15,7 @@ MAINTAINER= billf@FreeBSD.org LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg -.if defined(WANT_X11) +.if defined(WITH_X11) LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \ Xpm.4:${PORTSDIR}/graphics/xpm @@ -23,9 +23,9 @@ USE_XLIB= YES .endif pre-fetch: -.if !defined(WANT_X11) +.if !defined(WITH_X11) @${ECHO} -n "If you want to compile in X support use " - @${ECHO} "'make -DWANT_X11' instead" + @${ECHO} "'make -DWITH_X11' instead" .endif pre-install: diff --git a/graphics/gd2/files/patch-ac b/graphics/gd2/files/patch-ac index de989ae7c0e..451bf86d46b 100644 --- a/graphics/gd2/files/patch-ac +++ b/graphics/gd2/files/patch-ac @@ -24,7 +24,7 @@ #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a #variation of this and comment out the line above. See also LIBS below. -#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF -+.if defined(WANT_X11) ++.if defined(WITH_X11) +CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +.else +CFLAGS+=-DHAVE_JPEG @@ -39,7 +39,7 @@ #variation of this and comment out the line above. Note that #Xpm requires X11. See also CFLAGS above. -#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -+.if defined(WANT_X11) ++.if defined(WITH_X11) +LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +.endif @@ -47,7 +47,7 @@ #If yours are somewhere else, change this. -INCLUDEDIRS=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11 +CFLAGS+=-I$(LOCALBASE)/include -+.if defined(WANT_X11) ++.if defined(WITH_X11) +CFLAGS+=-I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11 +.endif @@ -59,7 +59,7 @@ #on your system can't cause conflicts while building a new one. -LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib +LIBDIRS=-L. -L$(LOCALBASE)/lib -+.if defined(WANT_X11) ++.if defined(WITH_X11) +LIBDIRS+=-L$(X11BASE)/lib +.endif diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile index d8b829a0f21..f61b62b80f6 100644 --- a/graphics/gimp-app-devel/Makefile +++ b/graphics/gimp-app-devel/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -.if defined(USE_PERL) +.if !defined(WITHOUT_PERL) BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \ @@ -39,7 +39,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) CONFIGURE_ARGS= --disable-perl .endif @@ -51,11 +51,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gimp.1 gimptool.1 MAN5= gimprc.5 -.if !defined(WITH_GNOME) && exists(${X11BASE}/bin/gnome-config) -WITH_GNOME= yes -.endif - -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) PLISTORIG= ${PKGDIR}/PLIST PLIST= ${WRKDIR}/PLIST .else @@ -66,7 +62,8 @@ pre-fetch: @${ECHO} "'make -DWITHOUT_PERL' instead" .endif -.if defined(WITH_GNOME) && ${WITH_GNOME} == yes +.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ + && !defined(WITHOUT_GNOME)) LIB_DEPENDS+= gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs pre-install: @${CAT} ${PLISTORIG} > ${PLIST} diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index d8b829a0f21..f61b62b80f6 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -.if defined(USE_PERL) +.if !defined(WITHOUT_PERL) BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \ @@ -39,7 +39,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) CONFIGURE_ARGS= --disable-perl .endif @@ -51,11 +51,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gimp.1 gimptool.1 MAN5= gimprc.5 -.if !defined(WITH_GNOME) && exists(${X11BASE}/bin/gnome-config) -WITH_GNOME= yes -.endif - -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) PLISTORIG= ${PKGDIR}/PLIST PLIST= ${WRKDIR}/PLIST .else @@ -66,7 +62,8 @@ pre-fetch: @${ECHO} "'make -DWITHOUT_PERL' instead" .endif -.if defined(WITH_GNOME) && ${WITH_GNOME} == yes +.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ + && !defined(WITHOUT_GNOME)) LIB_DEPENDS+= gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs pre-install: @${CAT} ${PLISTORIG} > ${PLIST} diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile index d8b829a0f21..f61b62b80f6 100644 --- a/graphics/gimp-devel/Makefile +++ b/graphics/gimp-devel/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -.if defined(USE_PERL) +.if !defined(WITHOUT_PERL) BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \ @@ -39,7 +39,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) CONFIGURE_ARGS= --disable-perl .endif @@ -51,11 +51,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gimp.1 gimptool.1 MAN5= gimprc.5 -.if !defined(WITH_GNOME) && exists(${X11BASE}/bin/gnome-config) -WITH_GNOME= yes -.endif - -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) PLISTORIG= ${PKGDIR}/PLIST PLIST= ${WRKDIR}/PLIST .else @@ -66,7 +62,8 @@ pre-fetch: @${ECHO} "'make -DWITHOUT_PERL' instead" .endif -.if defined(WITH_GNOME) && ${WITH_GNOME} == yes +.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ + && !defined(WITHOUT_GNOME)) LIB_DEPENDS+= gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs pre-install: @${CAT} ${PLISTORIG} > ${PLIST} diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index d8b829a0f21..f61b62b80f6 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -.if defined(USE_PERL) +.if !defined(WITHOUT_PERL) BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \ @@ -39,7 +39,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) CONFIGURE_ARGS= --disable-perl .endif @@ -51,11 +51,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gimp.1 gimptool.1 MAN5= gimprc.5 -.if !defined(WITH_GNOME) && exists(${X11BASE}/bin/gnome-config) -WITH_GNOME= yes -.endif - -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) PLISTORIG= ${PKGDIR}/PLIST PLIST= ${WRKDIR}/PLIST .else @@ -66,7 +62,8 @@ pre-fetch: @${ECHO} "'make -DWITHOUT_PERL' instead" .endif -.if defined(WITH_GNOME) && ${WITH_GNOME} == yes +.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ + && !defined(WITHOUT_GNOME)) LIB_DEPENDS+= gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs pre-install: @${CAT} ${PLISTORIG} > ${PLIST} diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile index d8b829a0f21..f61b62b80f6 100644 --- a/graphics/gimp1/Makefile +++ b/graphics/gimp1/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -.if defined(USE_PERL) +.if !defined(WITHOUT_PERL) BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \ @@ -39,7 +39,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) CONFIGURE_ARGS= --disable-perl .endif @@ -51,11 +51,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gimp.1 gimptool.1 MAN5= gimprc.5 -.if !defined(WITH_GNOME) && exists(${X11BASE}/bin/gnome-config) -WITH_GNOME= yes -.endif - -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) PLISTORIG= ${PKGDIR}/PLIST PLIST= ${WRKDIR}/PLIST .else @@ -66,7 +62,8 @@ pre-fetch: @${ECHO} "'make -DWITHOUT_PERL' instead" .endif -.if defined(WITH_GNOME) && ${WITH_GNOME} == yes +.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ + && !defined(WITHOUT_GNOME)) LIB_DEPENDS+= gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs pre-install: @${CAT} ${PLISTORIG} > ${PLIST} diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile index d8b829a0f21..f61b62b80f6 100644 --- a/graphics/gimpshop/Makefile +++ b/graphics/gimpshop/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -.if defined(USE_PERL) +.if !defined(WITHOUT_PERL) BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \ @@ -39,7 +39,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) CONFIGURE_ARGS= --disable-perl .endif @@ -51,11 +51,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gimp.1 gimptool.1 MAN5= gimprc.5 -.if !defined(WITH_GNOME) && exists(${X11BASE}/bin/gnome-config) -WITH_GNOME= yes -.endif - -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) PLISTORIG= ${PKGDIR}/PLIST PLIST= ${WRKDIR}/PLIST .else @@ -66,7 +62,8 @@ pre-fetch: @${ECHO} "'make -DWITHOUT_PERL' instead" .endif -.if defined(WITH_GNOME) && ${WITH_GNOME} == yes +.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ + && !defined(WITHOUT_GNOME)) LIB_DEPENDS+= gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs pre-install: @${CAT} ${PLISTORIG} > ${PLIST} diff --git a/graphics/glx/Makefile b/graphics/glx/Makefile index e5e168c91dd..0e0b70ee25c 100644 --- a/graphics/glx/Makefile +++ b/graphics/glx/Makefile @@ -91,16 +91,16 @@ GNU_CONFIGURE= yes # we support nvidia RIVA 128, TNT.. and Matrox G200/400 cards .if defined(CHIPSET_3D) .if ${CHIPSET_3D} == RIVA -WITH_CHIPSET= --with-chipset=tnt +CONFIGURE_ARGS= --with-chipset=tnt .endif .if ${CHIPSET_3D} == MGA -WITH_CHIPSET= --with-chipset=mga +CONFIGURE_ARGS= --with-chipset=mga .endif .endif -CONFIGURE_ARGS= --with-mesa=${MESADIR} \ +CONFIGURE_ARGS+= --with-mesa=${MESADIR} \ --with-mesa-version=mesa30 \ - ${WITH_CHIPSET} # --with-mmx-asm --with-3dnow-asm + # --with-mmx-asm --with-3dnow-asm USE_GMAKE= yes diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index da18dcbdfd1..24d5a3f1ebe 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -30,7 +30,6 @@ PLIST_SUB+= OSMAJOR=${OSMAJOR} # # Support for Numeric is compiled in by default. # -WITH_NUMERIC?= yes NUMPYDIR= ${LOCALBASE}/lib/python1.5/site-packages/numerical # @@ -41,8 +40,7 @@ SETUP_FILES= ${FILESDIR}/Setup.base # # Support for Togl is compiled in by default. # -WITH_TOGL?= yes -.if defined(WITH_TOGL) && $(WITH_TOGL) == yes +.if !defined(WITHOUT_TOGL) SETUP_FILES+= ${FILESDIR}/Setup.add.togl LIB_DEPENDS+= tk82.1:${PORTSDIR}/x11-toolkits/tk82 .endif diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile index e5e168c91dd..0e0b70ee25c 100644 --- a/graphics/utah-glx/Makefile +++ b/graphics/utah-glx/Makefile @@ -91,16 +91,16 @@ GNU_CONFIGURE= yes # we support nvidia RIVA 128, TNT.. and Matrox G200/400 cards .if defined(CHIPSET_3D) .if ${CHIPSET_3D} == RIVA -WITH_CHIPSET= --with-chipset=tnt +CONFIGURE_ARGS= --with-chipset=tnt .endif .if ${CHIPSET_3D} == MGA -WITH_CHIPSET= --with-chipset=mga +CONFIGURE_ARGS= --with-chipset=mga .endif .endif -CONFIGURE_ARGS= --with-mesa=${MESADIR} \ +CONFIGURE_ARGS+= --with-mesa=${MESADIR} \ --with-mesa-version=mesa30 \ - ${WITH_CHIPSET} # --with-mmx-asm --with-3dnow-asm + # --with-mmx-asm --with-3dnow-asm USE_GMAKE= yes diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile index 4a9645bffd4..c8a59be60de 100644 --- a/irc/bitchx/Makefile +++ b/irc/bitchx/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.bitchx.com/pub/BitchX/source/ \ MAINTAINER= calle.madestrand@norrgarden.se -.if defined(USE_GNOME) +.if defined(WITH_GNOME) LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs .endif @@ -22,7 +22,7 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config WRKSRC= ${WRKDIR}/BitchX USE_AUTOCONF= yes USE_GMAKE= yes -.if defined(USE_GNOME) +.if defined(WITH_GNOME) CONFIGURE_ARGS+= --with-plugins --with-gtk --enable-sound .else CONFIGURE_ARGS+= --with-plugins --without-gtk @@ -39,9 +39,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_DATA="${INSTALL_DATA}" -.if !defined(USE_GNOME) +.if !defined(WITH_GNOME) pre-extract: - @${ECHO} "You can add hooks for GNOME by defining USE_GNOME" + @${ECHO} "You can add hooks for GNOME by defining WITH_GNOME" .endif pre-patch: @@ -54,7 +54,7 @@ post-install: ${CP} -r ${WRKSRC}/bitchx-docs/* ${PREFIX}/share/bx/help ${INSTALL_DATA} ${WRKSRC}/doc/bxfaq.html ${PREFIX}/share/doc/bitchx .endif -.if defined(USE_GNOME) +.if defined(WITH_GNOME) @${ECHO} bin/gtkBitchX >> ${TMPPLIST} @${ECHO} bin/gtkBitchX-1.0c16 >> ${TMPPLIST} @${ECHO} share/bx/plugins/nicklist.so >> ${TMPPLIST} diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile index 35f65033cff..c97d23fef18 100644 --- a/irc/irssi-devel/Makefile +++ b/irc/irssi-devel/Makefile @@ -14,7 +14,7 @@ MAINTAINER= jim@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ PropList.2:${PORTSDIR}/devel/libPropList -.if defined(USE_GNOME) +.if defined(WITH_GNOME) LIB_DEPENDS+= gnome.3:${PORTSDIR}/x11/gnomelibs .endif @@ -33,7 +33,7 @@ CONFIGURE_ARGS= --without-pthreads --without-socks --with-textui \ --with-proplist=${LOCALBASE} --without-servertest \ --disable-nls -.if defined(USE_GNOME) +.if defined(WITH_GNOME) PLIST= ${PKGDIR}/PLIST.gnome .endif @@ -45,9 +45,9 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif -.if defined(USE_GNOME) +.if defined(WITH_GNOME) CONFIGURE_ARGS+= --with-gnome -.if defined(USE_PANEL) +.if defined(WITH_PANEL) CONFIGURE_ARGS+= --with-gnome-panel .else CONFIGURE_ARGS+= --without-gnome-panel diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index 35f65033cff..c97d23fef18 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -14,7 +14,7 @@ MAINTAINER= jim@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ PropList.2:${PORTSDIR}/devel/libPropList -.if defined(USE_GNOME) +.if defined(WITH_GNOME) LIB_DEPENDS+= gnome.3:${PORTSDIR}/x11/gnomelibs .endif @@ -33,7 +33,7 @@ CONFIGURE_ARGS= --without-pthreads --without-socks --with-textui \ --with-proplist=${LOCALBASE} --without-servertest \ --disable-nls -.if defined(USE_GNOME) +.if defined(WITH_GNOME) PLIST= ${PKGDIR}/PLIST.gnome .endif @@ -45,9 +45,9 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif -.if defined(USE_GNOME) +.if defined(WITH_GNOME) CONFIGURE_ARGS+= --with-gnome -.if defined(USE_PANEL) +.if defined(WITH_PANEL) CONFIGURE_ARGS+= --with-gnome-panel .else CONFIGURE_ARGS+= --without-gnome-panel diff --git a/irc/xchat-devel/Makefile b/irc/xchat-devel/Makefile index 056c5cd088b..394689d3a8c 100644 --- a/irc/xchat-devel/Makefile +++ b/irc/xchat-devel/Makefile @@ -13,12 +13,12 @@ MASTER_SITES= http://xchat.org/files/source/1.4/ \ MAINTAINER= jim@FreeBSD.org -.if defined(USE_SOCKS) +.if defined(WITH_SOCKS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 .endif LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ Imlib.5:${PORTSDIR}/graphics/imlib -.if defined(USE_GNOME) +.if defined(WITH_GNOME) LIB_DEPENDS+= gnome.3:${PORTSDIR}/x11/gnomelibs .endif @@ -32,13 +32,13 @@ USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls --disable-python -.if defined(USE_SOCKS) +.if defined(WITH_SOCKS) CONFIGURE_ARGS+= --enable-socks .endif -.if defined(USE_GNOME) +.if defined(WITH_GNOME) CONFIGURE_ARGS+= --enable-gnome -.if defined(USE_PANEL) +.if defined(WITH_PANEL) CONFIGURE_ARGS+= --enable-panel .else CONFIGURE_ARGS+= --disable-panel @@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --disable-gnome CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ GLIB_CONFIG="${GLIB_CONFIG}" -.if defined(USE_GNOME) +.if defined(WITH_GNOME) PLIST= ${PKGDIR}/PLIST.gnome .endif diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index 056c5cd088b..394689d3a8c 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -13,12 +13,12 @@ MASTER_SITES= http://xchat.org/files/source/1.4/ \ MAINTAINER= jim@FreeBSD.org -.if defined(USE_SOCKS) +.if defined(WITH_SOCKS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 .endif LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ Imlib.5:${PORTSDIR}/graphics/imlib -.if defined(USE_GNOME) +.if defined(WITH_GNOME) LIB_DEPENDS+= gnome.3:${PORTSDIR}/x11/gnomelibs .endif @@ -32,13 +32,13 @@ USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls --disable-python -.if defined(USE_SOCKS) +.if defined(WITH_SOCKS) CONFIGURE_ARGS+= --enable-socks .endif -.if defined(USE_GNOME) +.if defined(WITH_GNOME) CONFIGURE_ARGS+= --enable-gnome -.if defined(USE_PANEL) +.if defined(WITH_PANEL) CONFIGURE_ARGS+= --enable-panel .else CONFIGURE_ARGS+= --disable-panel @@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --disable-gnome CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ GLIB_CONFIG="${GLIB_CONFIG}" -.if defined(USE_GNOME) +.if defined(WITH_GNOME) PLIST= ${PKGDIR}/PLIST.gnome .endif diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile index 056c5cd088b..394689d3a8c 100644 --- a/irc/xchat/Makefile +++ b/irc/xchat/Makefile @@ -13,12 +13,12 @@ MASTER_SITES= http://xchat.org/files/source/1.4/ \ MAINTAINER= jim@FreeBSD.org -.if defined(USE_SOCKS) +.if defined(WITH_SOCKS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 .endif LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ Imlib.5:${PORTSDIR}/graphics/imlib -.if defined(USE_GNOME) +.if defined(WITH_GNOME) LIB_DEPENDS+= gnome.3:${PORTSDIR}/x11/gnomelibs .endif @@ -32,13 +32,13 @@ USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls --disable-python -.if defined(USE_SOCKS) +.if defined(WITH_SOCKS) CONFIGURE_ARGS+= --enable-socks .endif -.if defined(USE_GNOME) +.if defined(WITH_GNOME) CONFIGURE_ARGS+= --enable-gnome -.if defined(USE_PANEL) +.if defined(WITH_PANEL) CONFIGURE_ARGS+= --enable-panel .else CONFIGURE_ARGS+= --disable-panel @@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --disable-gnome CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ GLIB_CONFIG="${GLIB_CONFIG}" -.if defined(USE_GNOME) +.if defined(WITH_GNOME) PLIST= ${PKGDIR}/PLIST.gnome .endif diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile index 056c5cd088b..394689d3a8c 100644 --- a/irc/xchat1/Makefile +++ b/irc/xchat1/Makefile @@ -13,12 +13,12 @@ MASTER_SITES= http://xchat.org/files/source/1.4/ \ MAINTAINER= jim@FreeBSD.org -.if defined(USE_SOCKS) +.if defined(WITH_SOCKS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 .endif LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ Imlib.5:${PORTSDIR}/graphics/imlib -.if defined(USE_GNOME) +.if defined(WITH_GNOME) LIB_DEPENDS+= gnome.3:${PORTSDIR}/x11/gnomelibs .endif @@ -32,13 +32,13 @@ USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls --disable-python -.if defined(USE_SOCKS) +.if defined(WITH_SOCKS) CONFIGURE_ARGS+= --enable-socks .endif -.if defined(USE_GNOME) +.if defined(WITH_GNOME) CONFIGURE_ARGS+= --enable-gnome -.if defined(USE_PANEL) +.if defined(WITH_PANEL) CONFIGURE_ARGS+= --enable-panel .else CONFIGURE_ARGS+= --disable-panel @@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --disable-gnome CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ GLIB_CONFIG="${GLIB_CONFIG}" -.if defined(USE_GNOME) +.if defined(WITH_GNOME) PLIST= ${PKGDIR}/PLIST.gnome .endif diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile index 056c5cd088b..394689d3a8c 100644 --- a/irc/xchat2/Makefile +++ b/irc/xchat2/Makefile @@ -13,12 +13,12 @@ MASTER_SITES= http://xchat.org/files/source/1.4/ \ MAINTAINER= jim@FreeBSD.org -.if defined(USE_SOCKS) +.if defined(WITH_SOCKS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 .endif LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ Imlib.5:${PORTSDIR}/graphics/imlib -.if defined(USE_GNOME) +.if defined(WITH_GNOME) LIB_DEPENDS+= gnome.3:${PORTSDIR}/x11/gnomelibs .endif @@ -32,13 +32,13 @@ USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls --disable-python -.if defined(USE_SOCKS) +.if defined(WITH_SOCKS) CONFIGURE_ARGS+= --enable-socks .endif -.if defined(USE_GNOME) +.if defined(WITH_GNOME) CONFIGURE_ARGS+= --enable-gnome -.if defined(USE_PANEL) +.if defined(WITH_PANEL) CONFIGURE_ARGS+= --enable-panel .else CONFIGURE_ARGS+= --disable-panel @@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --disable-gnome CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ GLIB_CONFIG="${GLIB_CONFIG}" -.if defined(USE_GNOME) +.if defined(WITH_GNOME) PLIST= ${PKGDIR}/PLIST.gnome .endif diff --git a/japanese/dbskkd-cdb/Makefile b/japanese/dbskkd-cdb/Makefile index 20e25cc892d..675fae71394 100644 --- a/japanese/dbskkd-cdb/Makefile +++ b/japanese/dbskkd-cdb/Makefile @@ -34,9 +34,8 @@ post-install: .include <bsd.port.pre.mk> -.if defined(USE_INSTALLED_JISYO) && ${USE_INSTALLED_JISYO} == YES || \ - exists(${LOCALBASE}/share/skk/${SKKJISYO}) && \ - (!defined(USE_INSTALLED_JISYO) || ${USE_INSTALLED_JISYO} != NO) +.if defined(WITH_JISYO) || (exists(${LOCALBASE}/share/skk/${SKKJISYO}) \ + && !defined(WITHOUT_JISYO)) pre-build:: @${CP} ${LOCALBASE}/share/skk/${SKKJISYO} ${WRKSRC} .else @@ -45,9 +44,8 @@ pre-build:: @${CP} ${PORTSDIR}/japanese/skk-jisyo/work/*/jisyo/${SKKJISYO} ${WRKSRC} .endif -.if defined(USE_INSTALLED_CDB) && ${USE_INSTALLED_CDB} == YES || \ - exists(${LOCALBASE}/lib/libcdb.a) && exists(${LOCALBASE}/bin/cdbmake) && \ - (!defined(USE_INSTALLED_CDB) || ${USE_INSTALLED_CDB} != NO) +.if defined(WITH_CDB) || (exists(${LOCALBASE}/lib/libcdb.a) && \ + exists(${LOCALBASE}/bin/cdbmake) && !defined(WITHOUT_CDB)) pre-build:: @${CP} ${LOCALBASE}/lib/libcdb.a ${LOCALBASE}/bin/cdbmake ${WRKSRC} @(cd ${WRKSRC}; SKKJISYO=${SKKJISYO} ./makeskkcdb.sh) diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile index 7cbd4bae266..a0610ca523f 100644 --- a/japanese/jed/Makefile +++ b/japanese/jed/Makefile @@ -25,7 +25,7 @@ JP_VERSION= 067 DIST_SUBDIR= jed GNU_CONFIGURE= yes CONFIGURE_ENV= JED_ROOT="${JED_ROOT}" X_EXTRA_LIBS="-lxpg4 -lcurses" -CONFIGURE_ARGS= --enable-x-locale=no --with-canna="${WITH_CANNA}" +CONFIGURE_ARGS= --enable-x-locale=no ALL_TARGET= ${BINSTUFF} getmail MAN1= jed.1 rgrep.1 @@ -34,10 +34,10 @@ BINSTUFF= jed rgrep .include <bsd.port.pre.mk> -.if defined(NO_CANNA) -WITH_CANNA= no +.if defined(WITHOUT_CANNA) +CONFIGURE_ARGS+= --with-canna=no .else -WITH_CANNA= yes +CONFIGURE_ARGS+= --with-canna=yes LIBDEP_CANNA= canna.1:${PORTSDIR}/japanese/Canna .endif @@ -46,11 +46,11 @@ LIBDEP_CANNA= canna.1:${PORTSDIR}/japanese/Canna XJED_BROKEN= yes .endif -.if defined(NO_X11) -NO_XJED= yes +.if defined(WITHOUT_X11) +WITHOUT_XJED= yes .endif -.if defined(NO_XJED) +.if defined(WITHOUT_XJED) || defined(XJED_BROKEN) PLIST_SUB= XJED_ENTRY="@comment xjed is not installed" .else USE_XLIB= yes @@ -64,14 +64,14 @@ _INFODIR= ${WRKSRC}/info _LIBDIR= ${WRKSRC}/lib pre-fetch: -.if !defined(NO_CANNA) - @${ECHO_MSG} "To build this port without Canna, define \"NO_CANNA\"." +.if !defined(WITHOUT_CANNA) + @${ECHO_MSG} "To build this port without Canna, define \"WITHOUT_CANNA\"." .endif -.if !defined(NO_XJED) +.if !defined(WITHOUT_XJED) .if defined(XJED_BROKEN) @${ECHO_MSG} "Sorry, I will not build xjed since it is broken on 3.x-STABLE for the present." .else - @${ECHO_MSG} "To build this port without xjed, define \"NO_XJED\"." + @${ECHO_MSG} "To build this port without xjed, define \"WITHOUT_XJED\"." .endif .endif diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile index ecf568af4f2..7e1c4359403 100644 --- a/japanese/kterm/Makefile +++ b/japanese/kterm/Makefile @@ -36,27 +36,22 @@ DOCDIR= ${PREFIX}/share/doc/kterm .if !defined(PACKAGE_BUILDING) -.if defined(USE_XAW3DLIB) && defined(USE_NEXTAWLIB) -.if (${USE_XAW3DLIB} == "YES") && (${USE_NEXTAWLIB} == "YES") +.if defined(WITH_XAW3DLIB) && defined(WITH_NEXTAWLIB) .BEGIN: - @${ECHO} "Error: \$${USE_XAW3DLIB} and \$${USE_NEXTAWLIB} cannot be specified simultaneously!" + @${ECHO} "Error: \$${WITH_XAW3DLIB} and \$${WITH_NEXTAWLIB} cannot be specified simultaneously!" @${FALSE} -.endif -.elif defined(USE_XAW3DLIB) -.if (${USE_XAW3DLIB} == "YES") +.elif defined(WITH_XAW3DLIB) LIB_DEPENDS+= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d post-patch: @${ECHO_MSG} "===> Applying Xaw3d scrollbar patch" @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-Xaw3d -.endif -.elif defined(USE_NEXTAWLIB) -.if (${USE_NEXTAWLIB} == "YES") +.elif defined(WITH_NEXTAWLIB) LIB_DEPENDS+= neXtaw.6:${PORTSDIR}/x11-toolkits/neXtaw post-patch: @${ECHO_MSG} "===> Applying neXtaw scrollbar patch" @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-neXtaw .endif -.endif + .endif post-install: diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile index cbc65266bcd..7bbfd9951ab 100644 --- a/japanese/kterm16c/Makefile +++ b/japanese/kterm16c/Makefile @@ -43,27 +43,22 @@ post-extract: .if !defined(PACKAGE_BUILDING) -.if defined(USE_XAW3DLIB) && defined(USE_NEXTAWLIB) -.if (${USE_XAW3DLIB} == "YES") && (${USE_NEXTAWLIB} == "YES") +.if defined(WITH_XAW3DLIB) && defined(WITH_NEXTAWLIB) .BEGIN: - @${ECHO} "Error: \$${USE_XAW3DLIB} and \$${USE_NEXTAWLIB} cannot be specified simultaneously!" + @${ECHO} "Error: \$${WITH_XAW3DLIB} and \$${WITH_NEXTAWLIB} cannot be specified simultaneously!" @${FALSE} -.endif -.elif defined(USE_XAW3DLIB) -.if (${USE_XAW3DLIB} == "YES") +.elif defined(WITH_XAW3DLIB) LIB_DEPENDS+= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d post-patch: @${ECHO_MSG} "===> Applying Xaw3d scrollbar patch" @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-Xaw3d -.endif -.elif defined(USE_NEXTAWLIB) -.if (${USE_NEXTAWLIB} == "YES") +.elif defined(WITH_NEXTAWLIB) LIB_DEPENDS+= neXtaw.6:${PORTSDIR}/x11-toolkits/neXtaw post-patch: @${ECHO_MSG} "===> Applying neXtaw scrollbar patch" @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-neXtaw .endif -.endif + .endif do-install: diff --git a/japanese/latex2html/Makefile b/japanese/latex2html/Makefile index 45d3d1f21c7..b3314a344f5 100644 --- a/japanese/latex2html/Makefile +++ b/japanese/latex2html/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # # Default image format is GIF. -# If you prefer PNG to GIF, define USE_PNG (`make -DUSE_PNG`). +# If you prefer PNG to GIF, define WITH_PNG (`make -DWITH_PNG`). PORTNAME= latex2html PORTVERSION= ${VERSION}j${JP_VERSION} @@ -24,7 +24,7 @@ RUN_DEPENDS= ${PREFIX}/bin/latex:${PORTSDIR}/print/latex \ ${PREFIX}/bin/gs:${PORTSDIR}/print/ghostscript5 \ ${LOCALBASE}/bin/anytopnm:${PORTSDIR}/graphics/netpbm -.ifdef USE_PNG +.ifdef WITH_PNG RUN_DEPENDS += ${X11BASE}/bin/pnmtopng:${PORTSDIR}/graphics/pnmtopng .endif @@ -55,7 +55,7 @@ post-patch: "s|LATEX2HTMLDIR\s*=.*;|LATEX2HTMLDIR='${L2HDIR}';|; s|^use lib.*;|use lib '${L2HDIR}';|;" \ ${WRKDIR}/$$file; \ done -.ifdef USE_PNG +.ifdef WITH_PNG @${PERL} -pi -e "s|IMAGE_TYPE=.*;|IMAGE_TYPE='png';|" \ ${WRKDIR}/jlatex2html.config .endif diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile index 8f044d6373d..b6d64f7cee1 100644 --- a/japanese/postgresql-tcltk/Makefile +++ b/japanese/postgresql-tcltk/Makefile @@ -18,28 +18,27 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src PLISTS= # 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= ${PREFIX}/include/tcl8.0jp TK_INCDIR= ${PREFIX}/include/tk8.0jp MAKE_ENV= USE_TCL=true USE_TK=true TCL_INCDIR=${TCL_INCDIR} -WITH_TCL= --with-tcl -WITH_TK= --with-tk -WITH_TCLCONFIG= --with-tclconfig=${PREFIX}/lib/tcl8.0jp -WITH_TKCONFIG= --with-tkconfig=${PREFIX}/lib/tk8.0jp +CONFIGURE_ARGS= --with-tcl --with-tk \ + --with-tclconfig=${PREFIX}/lib/tcl8.0jp \ + --with-tkconfig=${PREFIX}/lib/tk8.0jp LIB_DEPENDS= tcl80jp.1:${PORTSDIR}/japanese/tcl80 \ tk80jp.1:${PORTSDIR}/japanese/tk80 PLISTS+= PLIST.tcl .endif .if defined(MULTIBYTE) -WITH_MB= --with-mb=${MULTIBYTE} +CONFIGURE_ARGS+= --with-mb=${MULTIBYTE} .endif -.if defined(USE_PERL) -WITH_PERL= --with-perl +.if defined(WITH_PERL) +CONFIGURE_ARGS+= --with-perl PLISTS+= PLIST.pl .endif -.if defined(USE_ODBC) -WITH_ODBC= --with-odbc +.if defined(WITH_ODBC) +CONFIGURE_ARGS+= --with-odbc PLISTS+= PLIST.odbc .endif @@ -48,13 +47,10 @@ NO_PACKAGE= "Requires ${PGSQL_UID} uid" USE_GMAKE= YES MAKEFILE= GNUmakefile HAS_CONFIGURE= YES -CONFIGURE_ARGS= --prefix=${PREFIX}/${INSTALL_DIR} \ +CONFIGURE_ARGS+= --prefix=${PREFIX}/${INSTALL_DIR} \ --with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ - ${WITH_TCL} ${WITH_TCLCONFIG} \ - ${WITH_TK} ${WITH_TKCONFIG} \ --with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ - --with-libraries=${PREFIX}/lib \ - ${WITH_MB} ${WITH_PERL} ${WITH_ODBC} + --with-libraries=${PREFIX}/lib INSTALL_TARGET= install install-man @@ -89,14 +85,14 @@ PGSQL_UID= pgsql PGSQL_GID= pgsql pre-fetch: -.if !defined(USE_TCL) & !defined(USE_PERL) & !defined(USE_ODBC) & !defined(MULTIBYTE) +.if !defined(WITH_TCL) & !defined(WITH_PERL) & !defined(WITH_ODBC) & !defined(MULTIBYTE) @${ECHO_MSG} "To build the \"MULTIBYTE PostgreSQL\", type:" @${ECHO_MSG} " make MULTIBYTE={EUC_JP,EUC_CN,EUC_KR,EUC_TW,UNICODE,MULE_INTERNAL,LATIN1-5}" - @${ECHO_MSG} " USE_TCL=yes, USE_PERL=yes, USE_ODBC=yes" + @${ECHO_MSG} " WITH_TCL=yes, WITH_PERL=yes, WITH_ODBC=yes" @${ECHO_MSG} "" @${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 @@ -115,15 +111,14 @@ post-build: .for i in ${PLISTS} PLIST ${CAT} ${PKGDIR}/${i} >> ${WRKDIR}/PLIST .endfor -.if defined(USE_TCL) +.if defined(WITH_TCL) ${CAT} ${PKGDIR}/PLIST.tcl.dirrm >> ${WRKDIR}/PLIST .endif -.if defined(USE_ODBC) +.if defined(WITH_ODBC) ${CAT} ${PKGDIR}/PLIST.odbc.dirrm >> ${WRKDIR}/PLIST - ${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST -.else - ${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST .endif + ${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST + pre-install: .if defined(PACKAGE_BUILDING) ${RM} -rf ${PREFIX}/${INSTALL_DIR} diff --git a/japanese/postgresql/Makefile b/japanese/postgresql/Makefile index 8f044d6373d..b6d64f7cee1 100644 --- a/japanese/postgresql/Makefile +++ b/japanese/postgresql/Makefile @@ -18,28 +18,27 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src PLISTS= # 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= ${PREFIX}/include/tcl8.0jp TK_INCDIR= ${PREFIX}/include/tk8.0jp MAKE_ENV= USE_TCL=true USE_TK=true TCL_INCDIR=${TCL_INCDIR} -WITH_TCL= --with-tcl -WITH_TK= --with-tk -WITH_TCLCONFIG= --with-tclconfig=${PREFIX}/lib/tcl8.0jp -WITH_TKCONFIG= --with-tkconfig=${PREFIX}/lib/tk8.0jp +CONFIGURE_ARGS= --with-tcl --with-tk \ + --with-tclconfig=${PREFIX}/lib/tcl8.0jp \ + --with-tkconfig=${PREFIX}/lib/tk8.0jp LIB_DEPENDS= tcl80jp.1:${PORTSDIR}/japanese/tcl80 \ tk80jp.1:${PORTSDIR}/japanese/tk80 PLISTS+= PLIST.tcl .endif .if defined(MULTIBYTE) -WITH_MB= --with-mb=${MULTIBYTE} +CONFIGURE_ARGS+= --with-mb=${MULTIBYTE} .endif -.if defined(USE_PERL) -WITH_PERL= --with-perl +.if defined(WITH_PERL) +CONFIGURE_ARGS+= --with-perl PLISTS+= PLIST.pl .endif -.if defined(USE_ODBC) -WITH_ODBC= --with-odbc +.if defined(WITH_ODBC) +CONFIGURE_ARGS+= --with-odbc PLISTS+= PLIST.odbc .endif @@ -48,13 +47,10 @@ NO_PACKAGE= "Requires ${PGSQL_UID} uid" USE_GMAKE= YES MAKEFILE= GNUmakefile HAS_CONFIGURE= YES -CONFIGURE_ARGS= --prefix=${PREFIX}/${INSTALL_DIR} \ +CONFIGURE_ARGS+= --prefix=${PREFIX}/${INSTALL_DIR} \ --with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ - ${WITH_TCL} ${WITH_TCLCONFIG} \ - ${WITH_TK} ${WITH_TKCONFIG} \ --with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ - --with-libraries=${PREFIX}/lib \ - ${WITH_MB} ${WITH_PERL} ${WITH_ODBC} + --with-libraries=${PREFIX}/lib INSTALL_TARGET= install install-man @@ -89,14 +85,14 @@ PGSQL_UID= pgsql PGSQL_GID= pgsql pre-fetch: -.if !defined(USE_TCL) & !defined(USE_PERL) & !defined(USE_ODBC) & !defined(MULTIBYTE) +.if !defined(WITH_TCL) & !defined(WITH_PERL) & !defined(WITH_ODBC) & !defined(MULTIBYTE) @${ECHO_MSG} "To build the \"MULTIBYTE PostgreSQL\", type:" @${ECHO_MSG} " make MULTIBYTE={EUC_JP,EUC_CN,EUC_KR,EUC_TW,UNICODE,MULE_INTERNAL,LATIN1-5}" - @${ECHO_MSG} " USE_TCL=yes, USE_PERL=yes, USE_ODBC=yes" + @${ECHO_MSG} " WITH_TCL=yes, WITH_PERL=yes, WITH_ODBC=yes" @${ECHO_MSG} "" @${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 @@ -115,15 +111,14 @@ post-build: .for i in ${PLISTS} PLIST ${CAT} ${PKGDIR}/${i} >> ${WRKDIR}/PLIST .endfor -.if defined(USE_TCL) +.if defined(WITH_TCL) ${CAT} ${PKGDIR}/PLIST.tcl.dirrm >> ${WRKDIR}/PLIST .endif -.if defined(USE_ODBC) +.if defined(WITH_ODBC) ${CAT} ${PKGDIR}/PLIST.odbc.dirrm >> ${WRKDIR}/PLIST - ${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST -.else - ${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST .endif + ${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST + pre-install: .if defined(PACKAGE_BUILDING) ${RM} -rf ${PREFIX}/${INSTALL_DIR} diff --git a/japanese/postgresql7/Makefile b/japanese/postgresql7/Makefile index 8f044d6373d..b6d64f7cee1 100644 --- a/japanese/postgresql7/Makefile +++ b/japanese/postgresql7/Makefile @@ -18,28 +18,27 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src PLISTS= # 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= ${PREFIX}/include/tcl8.0jp TK_INCDIR= ${PREFIX}/include/tk8.0jp MAKE_ENV= USE_TCL=true USE_TK=true TCL_INCDIR=${TCL_INCDIR} -WITH_TCL= --with-tcl -WITH_TK= --with-tk -WITH_TCLCONFIG= --with-tclconfig=${PREFIX}/lib/tcl8.0jp -WITH_TKCONFIG= --with-tkconfig=${PREFIX}/lib/tk8.0jp +CONFIGURE_ARGS= --with-tcl --with-tk \ + --with-tclconfig=${PREFIX}/lib/tcl8.0jp \ + --with-tkconfig=${PREFIX}/lib/tk8.0jp LIB_DEPENDS= tcl80jp.1:${PORTSDIR}/japanese/tcl80 \ tk80jp.1:${PORTSDIR}/japanese/tk80 PLISTS+= PLIST.tcl .endif .if defined(MULTIBYTE) -WITH_MB= --with-mb=${MULTIBYTE} +CONFIGURE_ARGS+= --with-mb=${MULTIBYTE} .endif -.if defined(USE_PERL) -WITH_PERL= --with-perl +.if defined(WITH_PERL) +CONFIGURE_ARGS+= --with-perl PLISTS+= PLIST.pl .endif -.if defined(USE_ODBC) -WITH_ODBC= --with-odbc +.if defined(WITH_ODBC) +CONFIGURE_ARGS+= --with-odbc PLISTS+= PLIST.odbc .endif @@ -48,13 +47,10 @@ NO_PACKAGE= "Requires ${PGSQL_UID} uid" USE_GMAKE= YES MAKEFILE= GNUmakefile HAS_CONFIGURE= YES -CONFIGURE_ARGS= --prefix=${PREFIX}/${INSTALL_DIR} \ +CONFIGURE_ARGS+= --prefix=${PREFIX}/${INSTALL_DIR} \ --with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \ - ${WITH_TCL} ${WITH_TCLCONFIG} \ - ${WITH_TK} ${WITH_TKCONFIG} \ --with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \ - --with-libraries=${PREFIX}/lib \ - ${WITH_MB} ${WITH_PERL} ${WITH_ODBC} + --with-libraries=${PREFIX}/lib INSTALL_TARGET= install install-man @@ -89,14 +85,14 @@ PGSQL_UID= pgsql PGSQL_GID= pgsql pre-fetch: -.if !defined(USE_TCL) & !defined(USE_PERL) & !defined(USE_ODBC) & !defined(MULTIBYTE) +.if !defined(WITH_TCL) & !defined(WITH_PERL) & !defined(WITH_ODBC) & !defined(MULTIBYTE) @${ECHO_MSG} "To build the \"MULTIBYTE PostgreSQL\", type:" @${ECHO_MSG} " make MULTIBYTE={EUC_JP,EUC_CN,EUC_KR,EUC_TW,UNICODE,MULE_INTERNAL,LATIN1-5}" - @${ECHO_MSG} " USE_TCL=yes, USE_PERL=yes, USE_ODBC=yes" + @${ECHO_MSG} " WITH_TCL=yes, WITH_PERL=yes, WITH_ODBC=yes" @${ECHO_MSG} "" @${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 @@ -115,15 +111,14 @@ post-build: .for i in ${PLISTS} PLIST ${CAT} ${PKGDIR}/${i} >> ${WRKDIR}/PLIST .endfor -.if defined(USE_TCL) +.if defined(WITH_TCL) ${CAT} ${PKGDIR}/PLIST.tcl.dirrm >> ${WRKDIR}/PLIST .endif -.if defined(USE_ODBC) +.if defined(WITH_ODBC) ${CAT} ${PKGDIR}/PLIST.odbc.dirrm >> ${WRKDIR}/PLIST - ${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST -.else - ${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST .endif + ${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST + pre-install: .if defined(PACKAGE_BUILDING) ${RM} -rf ${PREFIX}/${INSTALL_DIR} diff --git a/lang/modula-3-lib/Makefile b/lang/modula-3-lib/Makefile index e6854379fdc..514e4dd7129 100644 --- a/lang/modula-3-lib/Makefile +++ b/lang/modula-3-lib/Makefile @@ -73,11 +73,11 @@ libdir= lib/m3/FreeBSD2 major= 6 # Support building on systems with or without X11 installed. -.ifdef NO_X11 +.ifdef WITHOUT_X11 PLIST= ${WRKDIR}/PLIST.noX11 .else pre-fetch: - @${ECHO_MSG} "To build this port without X11, define \"NO_X11\"." + @${ECHO_MSG} "To build this port without X11, define \"WITHOUT_X11\"." USE_XLIB= yes PLIST= ${WRKDIR}/PLIST diff --git a/lang/modula-3/Makefile b/lang/modula-3/Makefile index 3cf1ef0249a..1ce14f3901a 100644 --- a/lang/modula-3/Makefile +++ b/lang/modula-3/Makefile @@ -33,11 +33,11 @@ major= 6 temp_prefix= ${WRKSRC}/installed # Support building on systems with or without X11 installed. -.ifdef NO_X11 +.ifdef WITHOUT_X11 PLIST= ${WRKDIR}/PLIST.noX11 .else pre-fetch: - @${ECHO_MSG} "To build this port without X11, define \"NO_X11\"." + @${ECHO_MSG} "To build this port without X11, define \"WITHOUT_X11\"." PLIST= ${WRKDIR}/PLIST MAN1+= formsedit.1 replayheap.1 showheap.1 shownew.1 showthread.1 diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index 311e9a39b23..954c1d45a6e 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -36,9 +36,8 @@ SETUP_FILE= Setup # # This option is enabled by default. # -WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true -.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes +.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" @@ -57,8 +56,7 @@ PLIST_GMP= ${PKGDIR}/PLIST.gmp # to a web tree checker, to a collection of simple scripts that are useful # while extending or managing Python. # -WITH_TOOLS?= yes -.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes +.if !defined(WITHOUT_TOOLS) PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif @@ -99,7 +97,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/python1.5/site-packages -.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes +.if !defined(WITHOUT_TOOLS) @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif diff --git a/net/ppxp/Makefile b/net/ppxp/Makefile index 6648da36afb..61acffcecd4 100644 --- a/net/ppxp/Makefile +++ b/net/ppxp/Makefile @@ -18,7 +18,7 @@ MAINTAINER= nosuzuki@e-mail.ne.jp LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ xforms.0:${PORTSDIR}/x11-toolkits/xforms -.if defined(USE_TCLJP) +.if defined(WITH_TCLJP) BUILD_DEPENDS= wish8.0jp:${PORTSDIR}/japanese/tk80 \ tclsh8.0jp:${PORTSDIR}/japanese/tcl80 LIB_DEPENDS+= tcl80jp.1:${PORTSDIR}/japanese/tcl80 @@ -36,7 +36,7 @@ WRKSRC= ${WRKDIR}/ppxp USE_GMAKE= yes MAKEFILE= makefile GNU_CONFIGURE= yes -.if defined(USE_TCLJP) +.if defined(WITH_TCLJP) CONFIGURE_ARGS+= --with-tclsh=${PREFIX}/bin/tclsh8.0jp \ --with-wish=${PREFIX}/bin/wish8.0jp \ --with-tcl-includes=${PREFIX}/include/tcl8.0jp \ diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index 7eace10ec83..4cff53d5260 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -4,10 +4,6 @@ # # $FreeBSD$ # -# If you don't want to use Joerg Schilling's SCSI library, -# set DONT_USE_SCGLIB = yes -# If you don't want to use pthreads, set DONT_USE_PTHREADS = yes -# If you want the graphical X toc file editor, set XCDRDAO = yes PORTNAME= cdrdao PORTVERSION= 1.1.3 @@ -45,18 +41,21 @@ PLIST=${PKGDIR}/PLIST.xcdrdao CONFIGURE_ARGS= --disable-gtkmmtest .endif -.if defined(DONT_USE_SCGLIB) && ${OSVERSION} > 300000 +.if defined(WITHOUT_SCGLIB) && ${OSVERSION} > 300000 CONFIGURE_ARGS+= --without-scglib .endif -.if defined(DONT_USE_PTHREADS) && ${OSVERSION} > 320000 +.if defined(WITHOUT_PTHREADS) && ${OSVERSION} > 320000 CONFIGURE_ARGS+= --without-posix-threads .endif pre-fetch: + @${ECHO_MSG} "If you don't want to use Joerg Schilling's SCSI library," + @${ECHO_MSG} "set WITHOUT_SCGLIB=yes." + @${ECHO_MSG} "If you don't want to use pthreads, set WITHOUT_PTHREADS=yes." .if !defined(XCDRDAO) @${ECHO_MSG} "To build the graphical X toc file editor, xcdrdao, type:" - @${ECHO_MSG} " make XCDRDAO=yes" + @${ECHO_MSG} " make XCDRDAO=yes." .else @${ECHO_MSG} "Building with xcdrdao" .endif |