diff options
39 files changed, 42 insertions, 265 deletions
diff --git a/irc/dancer/Makefile b/irc/dancer/Makefile index c48bd3df493c..0dafbde72768 100644 --- a/irc/dancer/Makefile +++ b/irc/dancer/Makefile @@ -19,6 +19,7 @@ PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} WRKSRC= ${WRKDIR}/${DISTNAME}/src GNU_CONFIGURE= yes MAKE_ARGS+= CSPECIAL="${CFLAGS}" LDFLAGS="${LDFLAGS}" +LDFLAGS+= -lm do-install: @${MKDIR} ${DATADIR} @@ -27,10 +28,4 @@ do-install: dancer.config dancer.users \ dancer.funcs dancer.explain ${DATADIR} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} > 500000 -LDFLAGS+= -lm -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/irc/irc/Makefile b/irc/irc/Makefile index 333f81607755..51f70b77d8a3 100644 --- a/irc/irc/Makefile +++ b/irc/irc/Makefile @@ -36,9 +36,11 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/ircd STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/ircd.sh +OPTIONS= IPV6 "Enable IPv6 support" on + .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 400014 +.if defined(WITH_IPV6) CONFIGURE_ARGS+= --enable-ip6 .endif diff --git a/japanese/emacs-manual/Makefile b/japanese/emacs-manual/Makefile index b95ce6c32a42..a77816a17c57 100644 --- a/japanese/emacs-manual/Makefile +++ b/japanese/emacs-manual/Makefile @@ -49,14 +49,6 @@ TEXINFO= emacs.texi EMACS_ARGS= -batch -nw --multibyte -no-init-file -no-site-file EMACS_LOADLIBS= --load=texinfmt.el --load=PORT_TEXIFMT.MK -.include <bsd.port.pre.mk> - -.if defined(PACKAGE_BUILDING) -.if ${OSVERSION} < 500000 -IGNORE= is broken: hangs during build -.endif -.endif - post-extract: ${CP} ${FILESDIR}/PORT_TEXIFMT.MK ${WRKSRC} @(cd ${WRKDIR} && \ @@ -91,4 +83,4 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/info/$i.info ${PREFIX}/${INFO_PATH} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile index bb97223736a7..9172fe9d7345 100644 --- a/japanese/groff/Makefile +++ b/japanese/groff/Makefile @@ -87,11 +87,6 @@ pre-build: .endif .endif -# formatting groff.info requires texinfo 4.2 -.if ${OSVERSION} < 470000 -WITHOUT_INFO= yes -.endif - .if defined(WITHOUT_INFO) PLIST_SUB+= INFO="@comment " .else @@ -99,11 +94,6 @@ INFO= groff PLIST_SUB+= INFO="" .endif -# wchar.h is exist since 4.4-RELEASE -.if ${OSVERSION} < 440000 -WITHOUT_WCHAR_H= yes -.endif - POST_INSTALL_SEQ= install-links .if !defined(NOPORTDOCS) POST_INSTALL_SEQ+= install-documents diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile index e826436e8029..a0090fc9dd30 100644 --- a/japanese/jed/Makefile +++ b/japanese/jed/Makefile @@ -47,11 +47,6 @@ CONFIGURE_ARGS+= --with-canna=yes LIBDEP_CANNA= canna.1:${PORTSDIR}/japanese/Canna .endif -# XJED core dumps on 3.x-STABLE for the present. -.if ${OSVERSION} < 400000 -XJED_BROKEN= yes -.endif - .if defined(WITHOUT_X11) WITHOUT_XJED= yes .endif diff --git a/japanese/msdosfs/Makefile b/japanese/msdosfs/Makefile index 2769857fe3e4..c8a8650c93fa 100644 --- a/japanese/msdosfs/Makefile +++ b/japanese/msdosfs/Makefile @@ -22,10 +22,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/msdosfs.ja .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 410001 && ${OSVERSION} < 500000 -LAST_UPDATED= 20001027 -PATCHDIR= ${MASTERDIR}/patches.4 -.elif ${OSVERSION} >= 500016 && ${OSVERSION} < 501109 +.if ${OSVERSION} >= 500016 && ${OSVERSION} < 501109 # runs only after 9th Feb 2001 world LAST_UPDATED= 20010209 PATCHDIR= ${MASTERDIR}/patches.5 diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile index 1691acd218ce..4ed86535e938 100644 --- a/japanese/perl5/Makefile +++ b/japanese/perl5/Makefile @@ -55,12 +55,6 @@ PERL_SHLIBVER= 1 PLIST_SUB= JPERL_VERSION=${JPERL_VERSION} JPERL_VER=${JPERL_VER} \ JPERL_ARCH=${JPERL_ARCH} -.if ${OSVERSION} < 500000 -PLIST_SUB+= NOTON4="@comment " -.else -PLIST_SUB+= NOTON4="" -.endif - MAN1= a2p.1 c2ph.1 h2ph.1 h2xs.1 perl.1 perl5004delta.1 \ perlapio.1 perlbook.1 perlbot.1 perlbug.1 perlcall.1 \ perldata.1 perldebug.1 perldelta.1 perldiag.1 perldoc.1 \ diff --git a/japanese/perl5/pkg-plist b/japanese/perl5/pkg-plist index 4332027c9eef..de110e2130b7 100644 --- a/japanese/perl5/pkg-plist +++ b/japanese/perl5/pkg-plist @@ -536,8 +536,8 @@ lib/perl5/%%JPERL_VERSION%%/vars.pm @dirrmtry lib/perl5/site_perl/%%JPERL_VER%% @dirrmtry lib/perl5/site_perl @dirrmtry lib/perl5/%%JPERL_VERSION%%/pod -%%NOTON4%%@dirrmtry lib/perl5/%%JPERL_VERSION%%/man/man3 -%%NOTON4%%@dirrmtry lib/perl5/%%JPERL_VERSION%%/man +@dirrmtry lib/perl5/%%JPERL_VERSION%%/man/man3 +@dirrmtry lib/perl5/%%JPERL_VERSION%%/man @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/sdbm @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/re @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/attrs @@ -608,5 +608,5 @@ lib/perl5/%%JPERL_VERSION%%/vars.pm @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/CORE @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/B @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%% -%%NOTON4%%@dirrmtry lib/perl5/%%JPERL_VERSION%% +@dirrmtry lib/perl5/%%JPERL_VERSION%% @dirrmtry lib/perl5 diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile index ae75745ab1c1..a90a8a0fb1f6 100644 --- a/japanese/scim-skk/Makefile +++ b/japanese/scim-skk/Makefile @@ -39,10 +39,6 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${OSVERSION} < 500000 -BROKEN= does not compile on 4.x: bad C++ code -.endif - post-patch: @${REINPLACE_CMD} "s|LOCALBASE|${LOCALBASE}|" ${WRKSRC}/src/scim_skk_prefs.h diff --git a/java/jikes/Makefile b/java/jikes/Makefile index 44d48d94d222..58fdee628199 100644 --- a/java/jikes/Makefile +++ b/java/jikes/Makefile @@ -25,10 +25,4 @@ USE_BZIP2= yes CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" -.include <bsd.port.pre.mk> - -.if ${ARCH} == "alpha" && ${OSVERSION} < 500000 -BROKEN= "Internal compiler error on alpha 4.x" -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/java/tya/Makefile b/java/tya/Makefile index 2661a389ca19..09fdc56e695d 100644 --- a/java/tya/Makefile +++ b/java/tya/Makefile @@ -27,12 +27,8 @@ CONFIGURE_ARGS+= --with-jdk=${JAVADIR} JAVADIR?= ${LOCALBASE}/jdk1.1.8 JAVALIBDIR= ${PREFIX}/lib/tya -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500000 post-patch: @${REINPLACE_CMD} -e "s|-malign|-falign|g" ${WRKSRC}/Makefile.in -.endif post-configure: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/README @@ -48,4 +44,4 @@ do-install: @${ECHO_MSG} "" .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/pnet-base/Makefile b/lang/pnet-base/Makefile index e31356183474..d902ba474cd3 100644 --- a/lang/pnet-base/Makefile +++ b/lang/pnet-base/Makefile @@ -62,12 +62,6 @@ PLIST_SUB= I386="@comment " PLIST_SUB= I386="" .endif -.if ${OSVERSION} < 500000 -PLIST_SUB+= IS4X="@comment " ISNOT4X="" -.else -PLIST_SUB+= IS4X="" ISNOT4X="@comment " -.endif - post-everything:: .if !defined(WITH_OPTIMIZED_CFLAGS) @${ECHO_MSG} "Define optimized CFLAGS with" diff --git a/lang/pnet-base/pkg-plist b/lang/pnet-base/pkg-plist index 8031ef9bc71c..a01a596d5883 100644 --- a/lang/pnet-base/pkg-plist +++ b/lang/pnet-base/pkg-plist @@ -97,10 +97,8 @@ lib/libILEngine.a lib/libILImage.a lib/libILLink.a lib/libILSupport.a -%%I386%%%%IS4X%%lib/pnet/elf/libffi.a -%%I386%%%%IS4X%%lib/pnet/elf/libffi.la -%%I386%%%%ISNOT4X%%lib/pnet/libffi.a -%%I386%%%%ISNOT4X%%lib/pnet/libffi.la +%%I386%%lib/pnet/elf/libffi.a +%%I386%%lib/pnet/elf/libffi.la %%I386%%lib/pnet/libgc.a %%I386%%lib/pnet/libgc.la %%I386%%lib/pnet/libgc.so @@ -139,7 +137,7 @@ lib/libILSupport.a %%I386%%share/gc/tree.html %%I386%%@dirrm include/pnet/gc @dirrm include/pnet -%%I386%%%%IS4X%%@dirrm lib/pnet/elf +%%I386%%@dirrm lib/pnet/elf %%I386%%@dirrm lib/pnet @dirrm lib/cscc/plugins @dirrmtry lib/cscc diff --git a/lang/scriba/Makefile b/lang/scriba/Makefile index a17ba5dea03f..99f524a9657f 100644 --- a/lang/scriba/Makefile +++ b/lang/scriba/Makefile @@ -32,10 +32,6 @@ OPTIONS= BDB "Berkeley DB extension" off \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= "coredumps a lot" -.endif - .if ${ARCH} == "ia64" BROKEN= "fails to compile" .endif diff --git a/lang/tinycobol/Makefile b/lang/tinycobol/Makefile index 16c5e99ac75a..4c7b08c8f752 100644 --- a/lang/tinycobol/Makefile +++ b/lang/tinycobol/Makefile @@ -23,7 +23,8 @@ HAS_CONFIGURE= yes USE_BISON= yes USE_GMAKE= yes -CONFIGURE_ARGS= --with-libdb=3 +CONFIGURE_ARGS= --with-libdb=3 \ + --with-readline CPPFLAGS= -I${LOCALBASE}/include CFLAGS+= ${CPPFLAGS} LDFLAGS= -L${LOCALBASE}/lib @@ -37,11 +38,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/info/*.txt ${DOCSDIR} .endif -.include <bsd.port.pre.mk> - -# doesn't work with readline on FreeBSD 4.x -.if ${OSVERSION} >= 500000 -CONFIGURE_ARGS+= --with-readline -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile index 7a8c67fae118..47b77cb11500 100644 --- a/mail/cucipop/Makefile +++ b/mail/cucipop/Makefile @@ -14,21 +14,17 @@ PORTREVISION= 2 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/ -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 400014 PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \ ftp://ftp.pasta.cs.uit.no/pub/IPv6/misc/ PATCHFILES= cucipop-1.31-v6-20010223.diff.gz PATCH_DIST_STRIP= -p1 -.endif - -#BUILD_DEPENDS= ${PREFIX}/include/db2/db.h:${PORTSDIR}/databases/db2 MAINTAINER= ports@FreeBSD.org COMMENT= Cubic Circle's POP3 daemon (fully RFC1939 compliant) +#BUILD_DEPENDS= ${PREFIX}/include/db2/db.h:${PORTSDIR}/databases/db2 + MAN8= cucipop.8 #makevpopdb.8 PLIST_FILES= libexec/cucipop -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/moztraybiff/Makefile b/mail/moztraybiff/Makefile index 8c0ea2a195d3..8f15a200fe19 100644 --- a/mail/moztraybiff/Makefile +++ b/mail/moztraybiff/Makefile @@ -38,13 +38,7 @@ PLIST_DIRS= share/${PORTNAME} SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -.include <bsd.port.pre.mk> - post-patch: -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e "s|-fshort-wchar||" \ - ${WRKSRC}/components/Makefile -.endif @${REINPLACE_CMD} -e "s|^#!/bin/bash|#!/bin/sh|" \ ${WRKSRC}/get-platform @@ -57,4 +51,4 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/smail/Makefile b/mail/smail/Makefile index 4245a3bcc983..b492f78be4ce 100644 --- a/mail/smail/Makefile +++ b/mail/smail/Makefile @@ -106,7 +106,6 @@ post-install: .endif replace: -.if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating smail in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak @${ECHO_CMD} "#" > /etc/mail/mailer.conf @@ -117,38 +116,5 @@ replace: @${ECHO_CMD} "send-mail ${PREFIX}/bin/smail" >> /etc/mail/mailer.conf @${ECHO_CMD} "mailq ${PREFIX}/bin/smail" >> /etc/mail/mailer.conf @${ECHO_CMD} "newaliases ${PREFIX}/bin/smail" >> /etc/mail/mailer.conf -.else - @${ECHO_MSG} "===> Replacing sendmail programs" - if [ -e /usr/sbin/sendmail ]; then \ - ${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.BAK; \ - if [ -f /usr/sbin/sendmail.BAK ]; then \ - ${CHMOD} 0 /usr/sbin/sendmail.BAK; \ - fi;\ - fi - if [ -e ${PREFIX}/bin/smail ]; then \ - ${LN} -s ${PREFIX}/bin/smail /usr/sbin/sendmail; \ - fi - if [ -f /usr/sbin/mailstats ]; then \ - ${CHMOD} 0 /usr/sbin/mailstats; \ - fi - if [ -e /usr/bin/newaliases ]; then \ - ${MV} -f /usr/bin/newaliases /usr/bin/newaliases.BAK; \ - if [ -f /usr/bin/newaliases.BAK ]; then \ - ${CHMOD} 0 /usr/bin/newaliases.BAK; \ - fi;\ - fi - if [ -e ${PREFIX}/bin/newaliases ]; then \ - ${LN} -s ${PREFIX}/bin/newaliases /usr/bin/newaliases; \ - fi - if [ -e /usr/bin/mailq ]; then \ - ${MV} -f /usr/bin/mailq /usr/bin/mailq.BAK; \ - if [ -f /usr/bin/mailq.BAK ]; then \ - ${CHMOD} 0 /usr/bin/mailq.BAK; \ - fi;\ - fi - if [ -e ${PREFIX}/bin/mailq ]; then \ - ${LN} -s ${PREFIX}/bin/mailq /usr/bin/mailq; \ - fi -.endif .include <bsd.port.post.mk> diff --git a/mail/smtptrapd/Makefile b/mail/smtptrapd/Makefile index b128c7553b1f..a0c0ba34d8a5 100644 --- a/mail/smtptrapd/Makefile +++ b/mail/smtptrapd/Makefile @@ -17,16 +17,6 @@ USE_RC_SUBR= smtptrapd.sh PLIST_FILES= bin/smtptrapd -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads - -CFLAGS+= ${PTHREAD_CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include/pthread/linuxthreads -llthread -llgcc_r -.else -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -.endif - do-build: (cd ${WRKSRC} && ${CC} ${CFLAGS} -o smtptrapd smtptrapd.c) @@ -34,4 +24,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/smtptrapd ${PREFIX}/bin/ @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/solidpop3d/Makefile b/mail/solidpop3d/Makefile index bd3744e31579..359dcafbfa50 100644 --- a/mail/solidpop3d/Makefile +++ b/mail/solidpop3d/Makefile @@ -22,9 +22,11 @@ CONFIGURE_ARGS= --enable-pam --enable-apop --enable-bulletins \ --enable-last --enable-mapping --enable-nonip --enable-connect CONFIGURE_ENV= LDFLAGS="-lmd" +OPTIONS= IPV6 "Enable IPv6 support" On + .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 400014 +.if defined(WITH_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .endif diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile index 3cec7155474c..657564770d92 100644 --- a/mail/zmailer/Makefile +++ b/mail/zmailer/Makefile @@ -26,10 +26,6 @@ CONFIGURE_ARGS= --without-openssl .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500000 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-EAI_NODATA -.endif - CONFIGURE_ARGS+=--prefix=${PREFIX}/ \ --with-mailbin=${PREFIX}/sbin \ --with-mailbox=/var/mail \ diff --git a/mail/zmailer/files/extra-patch-EAI_NODATA b/mail/zmailer/files/patch-EAI_NODATA index b42624c6e7fd..b42624c6e7fd 100644 --- a/mail/zmailer/files/extra-patch-EAI_NODATA +++ b/mail/zmailer/files/patch-EAI_NODATA diff --git a/math/aamath/Makefile b/math/aamath/Makefile index e5da24494b20..2ddf9a7d85e0 100644 --- a/math/aamath/Makefile +++ b/math/aamath/Makefile @@ -22,15 +22,7 @@ MAN1= aamath.1 MAKE_ENV+= LDFLAGS="${LDFLAGS}" LDFLAGS= -lreadline -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS= ${LOCALBASE}/lib/libreadline.so -.endif - do-install: @${INSTALL_SCRIPT} ${WRKSRC}/aamath ${PREFIX}/bin @${INSTALL_DATA} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/dislin/Makefile b/math/dislin/Makefile index 0e4b468b0b1c..e7cbc3507a1d 100644 --- a/math/dislin/Makefile +++ b/math/dislin/Makefile @@ -35,11 +35,9 @@ USE_LDCONFIG= yes .include <bsd.port.pre.mk> -.if ${OSVERSION} > 500000 && ${OSVERSION} < 600000 +.if ${OSVERSION} < 600000 BINVER= -5.4 -.endif - -.if ${OSVERSION} >= 600000 +.else BINVER= -6.0 .endif diff --git a/math/fityk/Makefile b/math/fityk/Makefile index 0d8e63c23a2c..534e12acbf72 100644 --- a/math/fityk/Makefile +++ b/math/fityk/Makefile @@ -38,15 +38,9 @@ PLIST_DIRS= %%DATADIR%% CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= does not compile on 4.x -.endif - post-patch: @${REINPLACE_CMD} -e 's|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|config 3rdparty|config|g ; \ s|^install-data-am:|install-data-am:#|g' ${WRKSRC}/Makefile.in -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/gambit/Makefile b/math/gambit/Makefile index 7fa0633ff305..a3048050fb8e 100644 --- a/math/gambit/Makefile +++ b/math/gambit/Makefile @@ -29,13 +29,7 @@ LDFLAGS= ${PTHREAD_LIBS} CFLAGS+= -O2 -fno-strict-aliasing .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - post-patch: @${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/pgcalc/Makefile b/math/pgcalc/Makefile index d513c0ca3a37..34796584b910 100644 --- a/math/pgcalc/Makefile +++ b/math/pgcalc/Makefile @@ -25,10 +25,6 @@ OPTIONS= ARTS "Build with aRts support" on .include <bsd.port.pre.mk> -.if (${OSVERSION} < 500000) -BROKEN= Does not build with gcc2 and cannot link with gcc3 -.endif - .if !defined(WITH_ARTS) CONFIGURE_ARGS+= --without-arts .endif diff --git a/math/plplot/Makefile b/math/plplot/Makefile index 86ea95ffd651..276481b95efd 100644 --- a/math/plplot/Makefile +++ b/math/plplot/Makefile @@ -95,12 +95,6 @@ CONFIGURE_ARGS+= --disable-itcl --disable-tcl --disable-tk PLIST_SUB+= TCLTK="@comment " .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= incorrectly generates pkg-config files -.endif - pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "PLplot has the following tunable options:" @@ -136,4 +130,4 @@ post-install: ${DOCSDIR}/README.1st.csa .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/topaz/Makefile b/math/topaz/Makefile index f4b504b692c7..13125321cbcf 100644 --- a/math/topaz/Makefile +++ b/math/topaz/Makefile @@ -19,13 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_XLIB= yes MAKEFILE= Makefile.freebsd -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 400010 -LIB_DEPENDS+= ncurses:${PORTSDIR}/devel/ncurses -.endif - post-install: ${LN} -sf ${PREFIX}/lib/topaz/topaz.sh ${PREFIX}/bin/topaz -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/gpt/Makefile b/misc/gpt/Makefile index 6f6b5ae4018b..8f07f69ac03b 100644 --- a/misc/gpt/Makefile +++ b/misc/gpt/Makefile @@ -50,12 +50,6 @@ FIX_VAR_FILES= ${WRKSRC}/packaging_tools/perl/GPT/Localize.pm \ ${WRKSRC}/packaging_tools/perl/scripts/gpt-config \ ${WRKSRC}/tools/testArchiveTar -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= Does not build -.endif - post-patch: @${REINPLACE_CMD} -e "s|@@PERL@@|${PERL}|g" ${WRKSRC}/build_gpt @${REINPLACE_CMD} -e 's|$$gpath/var/lib/perl|/var/db/gpt|g' ${FIX_VAR_FILES} @@ -65,4 +59,4 @@ do-install: @cd ${WRKSRC}; \ GPT_LOCATION=${PREFIX} ./build_gpt --with-perl=${PERL} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/gpt31/Makefile b/misc/gpt31/Makefile index fba6486dc944..74cef5a0c1f8 100644 --- a/misc/gpt31/Makefile +++ b/misc/gpt31/Makefile @@ -51,12 +51,6 @@ FIX_VAR_FILES= ${WRKSRC}/packaging_tools/perl/GPT/Localize.pm \ ${WRKSRC}/packaging_tools/perl/scripts/gpt-config \ ${WRKSRC}/tools/testArchiveTar -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= "Does not build" -.endif - post-patch: @${REINPLACE_CMD} -e "s|@@PERL@@|${PERL}|g" ${WRKSRC}/build_gpt @${REINPLACE_CMD} -e 's|$$gpath/var/lib/perl|/var/db/gpt|g' ${FIX_VAR_FILES} @@ -66,4 +60,4 @@ do-install: @cd ${WRKSRC}; \ GPT_LOCATION=${PREFIX} ./build_gpt --with-perl=${PERL} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile index 7b658fe0b75a..ccacf00193ed 100644 --- a/misc/pinfo/Makefile +++ b/misc/pinfo/Makefile @@ -24,13 +24,6 @@ CONFIGURE_ARGS= --with-readline \ MAN1= pinfo.1 INFO= pinfo -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 400010 -LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses -CONFIGURE_ARGS+= --with-ncurses=${LOCALBASE} -.endif - .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " @@ -39,4 +32,4 @@ USE_GETTEXT= yes PLIST_SUB+= NLS="" .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/posixtestsuite/Makefile b/misc/posixtestsuite/Makefile index 61758f23a122..5728748b48ff 100644 --- a/misc/posixtestsuite/Makefile +++ b/misc/posixtestsuite/Makefile @@ -25,11 +25,7 @@ USE_GMAKE= YES .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -REGR_LOG= log.run-4stable -.else REGR_LOG= log.run-5current -.endif RUN_RESULT= ${WRKSRC}/run.result LOCAL_REGR_LOG= ${WRKSRC}/regression.result diff --git a/multimedia/acidrip/Makefile b/multimedia/acidrip/Makefile index aa685447e0a0..0c9ef68b4f59 100644 --- a/multimedia/acidrip/Makefile +++ b/multimedia/acidrip/Makefile @@ -23,17 +23,11 @@ RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes MAN1= acidrip.1 -.include <bsd.port.pre.mk> - .if defined(WITH_DVD_DEVICE) DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} .else -.if ${OSVERSION} < 500000 -DEFAULT_DVD_DEVICE=/dev/acd0c -.else DEFAULT_DVD_DEVICE=/dev/acd0 .endif -.endif pre-everything:: .if !defined(WITH_DVD_DEVICE) @@ -47,4 +41,4 @@ post-patch: ${WRKSRC}/AcidRip/acidrip.pm @${RM} ${WRKSRC}/AcidRip/*.bak -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile index 7ea53633ab4a..cc41f90d2d25 100644 --- a/multimedia/beep-media-player/Makefile +++ b/multimedia/beep-media-player/Makefile @@ -78,7 +78,7 @@ PLIST_SUB+= ESDPLUGIN:="@comment " WITHOUT_3DNOW= yes .endif -.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 +.if !defined(WITHOUT_3DNOW) CONFIGURE_ARGS+= --enable-3dnow .endif diff --git a/multimedia/dtv/Makefile b/multimedia/dtv/Makefile index a0f602f73f08..ffde9f9d23e1 100644 --- a/multimedia/dtv/Makefile +++ b/multimedia/dtv/Makefile @@ -18,10 +18,4 @@ RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 NOT_FOR_ARCHS= sparc64 -.include <bsd.port.pre.mk> - -.if ${ARCH} == "alpha" && ${OSVERSION} < 500000 -IGNORE= "cannot be build on alpha 4.x, which does not have bktr hardware support" -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile index 244cde9128bc..1f325d62587e 100644 --- a/multimedia/fxtv/Makefile +++ b/multimedia/fxtv/Makefile @@ -25,6 +25,8 @@ USE_GMAKE= yes MAKE_FLAGS= -e MAN1= fxtv.1 +ONLY_FOR_ARCHS= alpha i386 ia64 amd64 + OPTIONS= EXTRA "Extra programs required to record/playback/save" off .include <bsd.port.pre.mk> @@ -39,13 +41,6 @@ RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox \ mplex:${PORTSDIR}/multimedia/mplex .endif -pre-everything:: -.if ${OSVERSION} < 500000 -ONLY_FOR_ARCHS= i386 -.else -ONLY_FOR_ARCHS= alpha i386 ia64 amd64 -.endif - pre-install: ${CP} ${WRKSRC}/fxtv.1 ${WRKSRC}/fxtv.man diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile index 712a3581ec58..358724b93c4f 100644 --- a/multimedia/gmencoder/Makefile +++ b/multimedia/gmencoder/Makefile @@ -31,17 +31,11 @@ MAN1= gmencoder.1 DESKTOP_ENTRIES= "Gmencoder" "Gnome2 front-end to mplayer/mencoder" \ "" "gmencoder" "GNOME;Application;AudioVideo;" false -.include <bsd.port.pre.mk> - .if defined(WITH_DVD_DEVICE) DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} .else -.if ${OSVERSION} < 500000 -DEFAULT_DVD_DEVICE=/dev/acd0c -.else DEFAULT_DVD_DEVICE=/dev/acd0 .endif -.endif pre-everything:: .if !defined(WITH_DVD_DEVICE) @@ -65,4 +59,4 @@ post-install: .endif ${INSTALL_MAN} ${WRKSRC}/man/gmencoder.1 ${MANPREFIX}/man/man1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile index ac2c6985b6df..e3edf0b8d4bb 100644 --- a/multimedia/mplayerxp/Makefile +++ b/multimedia/mplayerxp/Makefile @@ -59,22 +59,6 @@ MAKE_ARGS+= CC="${CC}" LD="${LD}" CFLAGS+= -I${LOCALBASE}/include CFLAGS+= -fomit-frame-pointer -.if ${OSVERSION} < 500000 -CFLAGS+= -Dint_fast8_t=int8_t -CFLAGS+= -Dint_fast16_t=int16_t -CFLAGS+= -Dint_fast32_t=int32_t -CFLAGS+= -Duint_fast8_t=uint8_t -CFLAGS+= -Duint_fast16_t=uint16_t -CFLAGS+= -Duint_fast32_t=uint32_t -CFLAGS+= -Duint_fast64_t=uint64_t -CFLAGS+= -DPRId64=\\\"lld\\\" -CFLAGS+= -DPRIu64=\\\"llu\\\" -CFLAGS+= -DPRIx64=\\\"llx\\\" -CFLAGS+= -DPRIX64=\\\"llX\\\" -CFLAGS+= -DPRIdFAST16=\\\"d\\\" -CFLAGS+= -DPRIdFAST32=\\\"d\\\" -.endif - ## ## Feature detection ## |