From ec7c5b0142aeb3539337db2d501d7b5ecf5e7284 Mon Sep 17 00:00:00 2001 From: Edwin Groothuis Date: Thu, 4 Oct 2007 00:41:11 +0000 Subject: [PATCH] Remove always-false/true conditions based on OSVERSION 500000 --- devel/ZendOptimizer/Makefile | 4 ---- devel/allegro-devel/Makefile | 4 ---- devel/allegro/Makefile | 4 ---- devel/apr/Makefile | 4 ---- devel/apr0/Makefile | 4 ---- devel/apr1/Makefile | 4 ---- devel/apr2/Makefile | 4 ---- devel/codeblocks/Makefile | 3 --- devel/cppadvio/Makefile | 8 +------- devel/cvsd/Makefile | 14 +++++--------- devel/cvsnt/Makefile | 8 +------- devel/gtkmozedit/Makefile | 4 ---- devel/jtag/Makefile | 2 +- devel/libassa/Makefile | 8 +------- devel/libdisasm/Makefile | 7 +------ devel/liboil/Makefile | 4 ++-- devel/libtecla/Makefile | 5 ----- devel/libtecla/pkg-plist | 6 +++--- devel/linux_kdump/Makefile | 4 ---- devel/log4cxx/Makefile | 8 +------- devel/monotone/Makefile | 12 +++--------- devel/omake/Makefile | 11 +---------- devel/openwince-include/Makefile | 8 +------- devel/pwlib/Makefile | 5 ----- devel/py-kqueue/Makefile | 2 +- devel/rudiments/Makefile | 10 +--------- devel/rudiments/pkg-plist | 30 +++++++++++++++--------------- devel/sdl12/Makefile | 2 +- devel/sfslite/Makefile | 15 +++++---------- devel/simulavr/Makefile | 8 +------- devel/valgrind-snapshot/Makefile | 14 +------------- devel/valgrind-snapshot/pkg-plist | 1 - devel/valgrind/Makefile | 14 +------------- devel/valgrind/pkg-plist | 1 - dns/doc/Makefile | 8 +------- dns/firedns/Makefile | 8 +------- dns/ldns/Makefile | 6 +----- dns/powerdns-recursor/Makefile | 2 +- 38 files changed, 51 insertions(+), 215 deletions(-) diff --git a/devel/ZendOptimizer/Makefile b/devel/ZendOptimizer/Makefile index 183f67da9ba4..aa1e41bee5d2 100644 --- a/devel/ZendOptimizer/Makefile +++ b/devel/ZendOptimizer/Makefile @@ -24,9 +24,6 @@ PKGMESSAGE= ${WRKDIR}/pkg-message .include # Check for FreeBSD version -.if ${OSVERSION} < 500000 -IGNORE= this port is for FreeBSD 5 or above -.else .if ${OSVERSION} < 600000 .if ${ARCH} != "i386" IGNORE= this port is for FreeBSD 6 or above @@ -35,7 +32,6 @@ VER= 5.4 .else VER= 6.0 .endif -.endif .if ${PHP_VER} == 4 ZEND_PATH= 4.4.x diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile index de3fccea25ec..9a86906dd55b 100644 --- a/devel/allegro-devel/Makefile +++ b/devel/allegro-devel/Makefile @@ -48,10 +48,6 @@ SHLIB_VER= 43 .include -.if ${ARCH} == "alpha" && ${OSVERSION} < 500000 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-include-allegro-inline-fmaths.in -.endif - .if defined(WITH_AL) LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal CONFIGURE_ARGS+=--enable-sgialdigi diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile index 35f7d2d1a3d3..f3483f0b84ff 100644 --- a/devel/allegro/Makefile +++ b/devel/allegro/Makefile @@ -48,10 +48,6 @@ PORTSCOUT= limitw:1,even .include -.if ${ARCH} == "alpha" && ${OSVERSION} < 500000 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-include-allegro-inline-fmaths.in -.endif - .if defined(WITH_ARTS) LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts CONFIGURE_ARGS+=--enable-artsdigi diff --git a/devel/apr/Makefile b/devel/apr/Makefile index ef9c29c8230f..847ee4e1f8d5 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -42,10 +42,6 @@ APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \ .include -.if ${OSVERSION} < 500000 && defined(APR_SVN_WITHOUT_THREADS_4) -APR_UTIL_WITHOUT_THREADS= yes -.endif - .if defined(APR_UTIL_WITHOUT_THREADS) CONFIGURE_ARGS+= --disable-threads APR_UTIL_CONF_ARGS+= --disable-threads diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile index ef9c29c8230f..847ee4e1f8d5 100644 --- a/devel/apr0/Makefile +++ b/devel/apr0/Makefile @@ -42,10 +42,6 @@ APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \ .include -.if ${OSVERSION} < 500000 && defined(APR_SVN_WITHOUT_THREADS_4) -APR_UTIL_WITHOUT_THREADS= yes -.endif - .if defined(APR_UTIL_WITHOUT_THREADS) CONFIGURE_ARGS+= --disable-threads APR_UTIL_CONF_ARGS+= --disable-threads diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index ef9c29c8230f..847ee4e1f8d5 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -42,10 +42,6 @@ APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \ .include -.if ${OSVERSION} < 500000 && defined(APR_SVN_WITHOUT_THREADS_4) -APR_UTIL_WITHOUT_THREADS= yes -.endif - .if defined(APR_UTIL_WITHOUT_THREADS) CONFIGURE_ARGS+= --disable-threads APR_UTIL_CONF_ARGS+= --disable-threads diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index ef9c29c8230f..847ee4e1f8d5 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -42,10 +42,6 @@ APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \ .include -.if ${OSVERSION} < 500000 && defined(APR_SVN_WITHOUT_THREADS_4) -APR_UTIL_WITHOUT_THREADS= yes -.endif - .if defined(APR_UTIL_WITHOUT_THREADS) CONFIGURE_ARGS+= --disable-threads APR_UTIL_CONF_ARGS+= --disable-threads diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile index 0be3157896fe..f261af40878a 100644 --- a/devel/codeblocks/Makefile +++ b/devel/codeblocks/Makefile @@ -36,9 +36,6 @@ LIB= ar .include -.if ${OSVERSION} < 500000 -BROKEN= Code::Blocks is currently not supported for FreeBSD versions prior to FreeBSD 5 -.endif .if ${ARCH} == ia64 && ${OSVERSION} >= 600000 && ${OSVERSION} < 700000 BROKEN= Code::Blocks is currently not supported on IA64 FreeBSD 6 .endif diff --git a/devel/cppadvio/Makefile b/devel/cppadvio/Makefile index aa3c391ab08c..edbd2fc2b13b 100644 --- a/devel/cppadvio/Makefile +++ b/devel/cppadvio/Makefile @@ -21,12 +21,6 @@ ALL_TARGET= lib USE_GMAKE= yes USE_GCC= 2.95 -.include - -.if ${ARCH} == "alpha" && ${OSVERSION} < 500000 -BROKEN= "Does not compile on alpha 4.x" -.endif - post-patch: @( cd ${WRKSRC}; ${MV} c++ c++.orig; \ ${SED} -e 's|^ *gcc|${CXX} ${CXXFLAGS}|' c++.orig > c++; ${CHMOD} +x c++ ) @@ -51,4 +45,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cppadvio .endif -.include +.include diff --git a/devel/cvsd/Makefile b/devel/cvsd/Makefile index 409e1dd821f6..f22bf90e7ffc 100644 --- a/devel/cvsd/Makefile +++ b/devel/cvsd/Makefile @@ -15,6 +15,8 @@ MASTER_SITES= http://ch.tudelft.nl/~arthur/cvsd/ MAINTAINER= bu7cher@yandex.ru COMMENT= CVS pserver daemon +EXTRA_PATCHES= ${FILESDIR}/extra-cvsd-buildroot.in + USE_PERL5= yes USE_GETOPT_LONG= yes GNU_CONFIGURE= yes @@ -32,16 +34,10 @@ PLIST_FILES= etc/cvsd/cvsd.conf.sample sbin/cvsd sbin/cvsd-buginfo \ PLIST_DIRS= etc/cvsd USE_RC_SUBR= cvsd -.include - -.if ${OSVERSION} > 500000 -EXTRA_PATCHES+= ${FILESDIR}/extra-cvsd-buildroot.in -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cvsd ${PREFIX}/sbin/cvsd -.for FILE in cvsd-buginfo cvsd-buildroot cvsd-passwd - ${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${PREFIX}/sbin +.for f in cvsd-buginfo cvsd-buildroot cvsd-passwd + ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/sbin .endfor @${MKDIR} ${PREFIX}/etc/cvsd ${INSTALL_DATA} ${WRKSRC}/cvsd.conf-dist ${PREFIX}/etc/cvsd/cvsd.conf.sample @@ -57,4 +53,4 @@ do-install: .endif @${CAT} ${PKGMESSAGE} -.include +.include diff --git a/devel/cvsnt/Makefile b/devel/cvsnt/Makefile index d7c7c33095fe..1ea882251a4f 100644 --- a/devel/cvsnt/Makefile +++ b/devel/cvsnt/Makefile @@ -33,10 +33,4 @@ MAN1= cvs.1 MAN5= cvs.5 MLINKS= cvs.1 cvsnt.1 cvs.5 cvsnt.5 -.include - -.if ${OSVERSION} < 500000 -IGNORE= requires wscanf, vswprintf -.endif - -.include +.include diff --git a/devel/gtkmozedit/Makefile b/devel/gtkmozedit/Makefile index 497b74f5bbeb..d192504e96f9 100644 --- a/devel/gtkmozedit/Makefile +++ b/devel/gtkmozedit/Makefile @@ -25,10 +25,6 @@ USE_GECKO= mozilla .include .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" -.if ${OSVERSION} < 500000 -BROKEN="Does not build" -.endif - post-patch: @${REINPLACE_CMD} -e 's|firefox-nspr|firefox-xpcom|; \ s|mozilla-nspr|mozilla-xpcom|' \ diff --git a/devel/jtag/Makefile b/devel/jtag/Makefile index 4f7acb1dd1d7..7eb138caba6c 100644 --- a/devel/jtag/Makefile +++ b/devel/jtag/Makefile @@ -40,7 +40,7 @@ PORTDOCS= * CFLAGS+= -Duseconds_t=long .endif -.if ${OSVERSION} < 500000 || exists(${LOCALBASE}/lib/libreadline.so.5) +.if exists(${LOCALBASE}/lib/libreadline.so.5) LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline .endif diff --git a/devel/libassa/Makefile b/devel/libassa/Makefile index e7ae0e456f07..3e5e89bfc519 100644 --- a/devel/libassa/Makefile +++ b/devel/libassa/Makefile @@ -29,13 +29,7 @@ MAN1= assa-genesis.1 post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS/s: doc : :g' ${WRKSRC}/Makefile.in -.include - -.if ( ${OSVERSION} < 500000 ) -BROKEN= compilation fails and passing -fhuge-objects does not help -.endif - post-install: ${INSTALL_MAN} ${WRKSRC}/debian/assa-genesis.1 ${PREFIX}/man/man1 -.include +.include diff --git a/devel/libdisasm/Makefile b/devel/libdisasm/Makefile index 274c16d34d56..86b4aac24907 100644 --- a/devel/libdisasm/Makefile +++ b/devel/libdisasm/Makefile @@ -22,13 +22,8 @@ USE_GMAKE= yes USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 -.include - post-patch: ${REINPLACE_CMD} -e 's, make, gmake,' ${WRKSRC}/Makefile -.if ${OSVERSION} < 500000 - ${REINPLACE_CMD} -e 's, -Wno-strict-aliasing,,' ${WRKSRC}/libdisasm/Makefile -.endif .if !defined(NOPORTDOCS) DOCSDIR= ${DATADIR}/doc @@ -57,4 +52,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/man/${i} ${PREFIX}/man/man7 .endfor -.include +.include diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile index 71c16f044b59..3aa5871b53cf 100644 --- a/devel/liboil/Makefile +++ b/devel/liboil/Makefile @@ -24,7 +24,7 @@ CFLAGS:= ${CFLAGS:N-O*} -O2 .include -.if ${OSVERSION} < 600000 && ${OSVERSION} > 500000 && !defined(WITH_3DNOW_GCC40) +.if ${OSVERSION} < 600000 && && !defined(WITH_3DNOW_GCC40) BUILD_DEPENDS+= gcc34:${PORTSDIR}/lang/gcc34 RUN_DEPENDS+= gcc34:${PORTSDIR}/lang/gcc34 CC:= gcc34 @@ -33,7 +33,7 @@ CXX:= g++34 .if defined(WITH_3DNOW_GCC40) && ${OSVERSION} < 700042 USE_GCC= 4.0+ -.if ${OSVERSION} < 600000 && ${OSVERSION} > 500000 +.if ${OSVERSION} < 600000 RUN_DEPENDS+= ${BUILD_DEPENDS} .endif .endif diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile index f3707bc27650..6efac42cdbe9 100644 --- a/devel/libtecla/Makefile +++ b/devel/libtecla/Makefile @@ -24,11 +24,6 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ PORTNAME="${PORTNAME}" .include -.if ${OSVERSION} < 500000 -PLIST_SUB+= THREADS="@comment " -.else -PLIST_SUB+= THREADS="" -.endif post-extract: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/genmanlist.sh diff --git a/devel/libtecla/pkg-plist b/devel/libtecla/pkg-plist index 788531526637..9860dc9debe1 100644 --- a/devel/libtecla/pkg-plist +++ b/devel/libtecla/pkg-plist @@ -3,6 +3,6 @@ include/libtecla.h lib/libtecla.a lib/libtecla.so lib/libtecla.so.1 -%%THREADS%%lib/libtecla_r.a -%%THREADS%%lib/libtecla_r.so -%%THREADS%%lib/libtecla_r.so.1 +lib/libtecla_r.a +lib/libtecla_r.so +lib/libtecla_r.so.1 diff --git a/devel/linux_kdump/Makefile b/devel/linux_kdump/Makefile index b51807f58847..4d5809e498db 100644 --- a/devel/linux_kdump/Makefile +++ b/devel/linux_kdump/Makefile @@ -24,10 +24,6 @@ PLIST_FILES= bin/linux_kdump .include -.if ${OSVERSION} < 500000 -USE_GCC= 3.4+ -.endif - .ifndef(SRCDIR) SRCDIR= /usr/src pre-everything:: diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile index 362e4fccbf27..b9438e4868ab 100644 --- a/devel/log4cxx/Makefile +++ b/devel/log4cxx/Makefile @@ -44,12 +44,6 @@ INSTALLS_SHLIB= yes PORTDOCS= * .endif -.include - -.if ${OSVERSION} < 500000 -IGNORE= does not compile on FreeBSD 4.x (missing swprintf in libc) -.endif - pre-configure: @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL}) @${REINPLACE_CMD} -e '/^_LT_AC_SHELL_INIT/d' ${WRKSRC}/aclocal.m4 @@ -65,4 +59,4 @@ post-install: done .endif -.include +.include diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index 4d0f1471cf6c..5119c797abf0 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -13,6 +13,8 @@ MASTER_SITES= http://monotone.ca/downloads/${PORTVERSION}/ MAINTAINER= lapo@lapo.it COMMENT= A distributed version control system with digital signatures +LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost + SUB_FILES= pkg-message USE_GCC= 3.4+ USE_PERL5_BUILD=yes @@ -30,14 +32,6 @@ PLIST_FILES= bin/mtn share/zsh/site-functions/_mtn \ INFO= monotone PORTDOCS= NEWS UPGRADE monotone.html -.include - -.if ${OSVERSION} < 500000 -LIB_DEPENDS+= boost_regex.4:${PORTSDIR}/devel/boost-gcc3 -.else -LIB_DEPENDS+= boost_regex.4:${PORTSDIR}/devel/boost -.endif - .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls .else @@ -63,4 +57,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include +.include diff --git a/devel/omake/Makefile b/devel/omake/Makefile index 944840e967de..0477d5df817b 100644 --- a/devel/omake/Makefile +++ b/devel/omake/Makefile @@ -29,7 +29,7 @@ INFO= omake-doc .include -.if ${OSVERSION} > 500000 && exists(${LOCALBASE}/lib/libreadline.so.5) +.if exists(${LOCALBASE}/lib/libreadline.so.5) LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -50,15 +50,6 @@ post-patch: ${WRKSRC}/OMakefile ${WRKSRC}/src/main/OMakefile \ ${WRKSRC}/doc/OMakefile -# -# Readline code is deeply broken on 4 -# -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -E -e \ - "s,^(READLINE_ENABLED[[:space:]]*=[[:space:]]*).*,\1false," \ - ${WRKSRC}/mk/make_config ${WRKSRC}/mk/defaults -.endif - post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/ diff --git a/devel/openwince-include/Makefile b/devel/openwince-include/Makefile index 89f7b29399e3..cc3c6009a292 100644 --- a/devel/openwince-include/Makefile +++ b/devel/openwince-include/Makefile @@ -20,16 +20,10 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -.include - -.if ${OSVERSION} < 500000 -PLIST_FILES= include/stdint.h -.endif - post-install: @${FIND} -d ${PREFIX}/include/openwince/ -type f | \ ${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} -d ${PREFIX}/include/openwince/ -type d | \ ${SED} -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} -.include +.include diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index f5c9f6f9cc2c..f021959247d6 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -145,10 +145,5 @@ post-patch: @${REINPLACE_CMD} -e 's|P_PTHREADS_XPG6|0|' \ ${WRKSRC}/src/ptlib/unix/tlibthrd.cxx .endif -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e 's|||' \ - ${WRKSRC}/src/ptlib/common/tinyjpeg.cxx \ - ${WRKSRC}/src/ptlib/common/jidctflt.cxx -.endif .include diff --git a/devel/py-kqueue/Makefile b/devel/py-kqueue/Makefile index 68a2f1651b1b..f20741d1b25d 100644 --- a/devel/py-kqueue/Makefile +++ b/devel/py-kqueue/Makefile @@ -25,7 +25,7 @@ MAKE_ENV= MAINCC=${CC} .include -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500010 +.if ${OSVERSION} < 500010 IGNORE="requires new kqueue API" .endif diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile index ed2f1fe372cc..432e11ac6e13 100644 --- a/devel/rudiments/Makefile +++ b/devel/rudiments/Makefile @@ -25,12 +25,4 @@ CONFIGURE_ENV= PTHREADINCLUDES="${PTHREAD_CFLAGS}" \ PTHREADLIB="${PTHREAD_LIBS}" USE_LDCONFIG= yes -.include - -.if ${OSVERSION} < 500000 -PLIST_SUB+= NOT4X="@comment " -.else -PLIST_SUB+= NOT4X="" -.endif - -.include +.include diff --git a/devel/rudiments/pkg-plist b/devel/rudiments/pkg-plist index ff29950c12d2..879bb835ed12 100644 --- a/devel/rudiments/pkg-plist +++ b/devel/rudiments/pkg-plist @@ -12,7 +12,7 @@ include/rudiments/datetime.h include/rudiments/device.h include/rudiments/dictionary.h include/rudiments/directory.h -%%NOT4X%%include/rudiments/dtd.h +include/rudiments/dtd.h include/rudiments/dynamiclib.h include/rudiments/environment.h include/rudiments/error.h @@ -28,7 +28,7 @@ include/rudiments/intervaltimer.h include/rudiments/linkedlist.h include/rudiments/listener.h include/rudiments/logger.h -%%NOT4X%%include/rudiments/memorymap.h +include/rudiments/memorymap.h include/rudiments/memorypool.h include/rudiments/modemclient.h include/rudiments/modemserver.h @@ -64,8 +64,8 @@ include/rudiments/private/dictionarynode.h include/rudiments/private/dictionarynodeinlines.h include/rudiments/private/directory.h include/rudiments/private/directoryincludes.h -%%NOT4X%%include/rudiments/private/dtd.h -%%NOT4X%%include/rudiments/private/dtdincludes.h +include/rudiments/private/dtd.h +include/rudiments/private/dtdincludes.h include/rudiments/private/dynamiclib.h include/rudiments/private/dynamiclibincludes.h include/rudiments/private/environmentincludes.h @@ -101,8 +101,8 @@ include/rudiments/private/listenerincludes.h include/rudiments/private/logdestination.h include/rudiments/private/logger.h include/rudiments/private/loggerincludes.h -%%NOT4X%%include/rudiments/private/memorymap.h -%%NOT4X%%include/rudiments/private/memorymapincludes.h +include/rudiments/private/memorymap.h +include/rudiments/private/memorymapincludes.h include/rudiments/private/memorypool.h include/rudiments/private/memorypoolincludes.h include/rudiments/private/modemclient.h @@ -161,12 +161,12 @@ include/rudiments/private/unixsocketutil.h include/rudiments/private/unixsocketutilincludes.h include/rudiments/private/variablebuffer.h include/rudiments/private/variablebufferincludes.h -%%NOT4X%%include/rudiments/private/xmldom.h -%%NOT4X%%include/rudiments/private/xmldomincludes.h -%%NOT4X%%include/rudiments/private/xmldomnode.h -%%NOT4X%%include/rudiments/private/xmldomnodeincludes.h -%%NOT4X%%include/rudiments/private/xmlsax.h -%%NOT4X%%include/rudiments/private/xmlsaxincludes.h +include/rudiments/private/xmldom.h +include/rudiments/private/xmldomincludes.h +include/rudiments/private/xmldomnode.h +include/rudiments/private/xmldomnodeincludes.h +include/rudiments/private/xmlsax.h +include/rudiments/private/xmlsaxincludes.h include/rudiments/process.h include/rudiments/protocolentry.h include/rudiments/randomnumber.h @@ -190,9 +190,9 @@ include/rudiments/unixclientsocket.h include/rudiments/unixserversocket.h include/rudiments/unixsocketutil.h include/rudiments/variablebuffer.h -%%NOT4X%%include/rudiments/xmldom.h -%%NOT4X%%include/rudiments/xmldomnode.h -%%NOT4X%%include/rudiments/xmlsax.h +include/rudiments/xmldom.h +include/rudiments/xmldomnode.h +include/rudiments/xmlsax.h lib/librudiments.a lib/librudiments.la lib/librudiments.so diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index b631ca101dda..0251e6172f02 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -49,7 +49,7 @@ OPTIONS= NAS "Include support for the Network Audio System" Off \ .include -.if ${OSVERSION} >= 500000 && exists(/usr/lib/libvgl.so) +.if exists(/usr/lib/libvgl.so) CONFIGURE_ARGS+=--enable-video-vgl DISPLAY_MSG= ${CAT} ${PKGMESSAGE} .else diff --git a/devel/sfslite/Makefile b/devel/sfslite/Makefile index 9f6ed0376240..dedaa0ed1667 100644 --- a/devel/sfslite/Makefile +++ b/devel/sfslite/Makefile @@ -13,6 +13,10 @@ MASTER_SITES= http://dist.okws.org/dist/ MAINTAINER= ports@okws.org COMMENT= Standard version of the sfslite library +LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 + +CONFIGURE_ARGS= --with-gmp=${LOCALBASE} + GNU_CONFIGURE= yes USE_GMAKE= yes # @@ -20,15 +24,6 @@ USE_GMAKE= yes # USE_BISON= yes -.include - -.if ${OSVERSION} > 500000 -LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4 -CONFIGURE_ARGS+=--with-gmp=${LOCALBASE} -.else -CONFIGURE_ARGS+=--with-gmp=/usr -.endif - # # Map X.Y.Z.Q => X.Y # @@ -68,4 +63,4 @@ PKG_INSTALL?= pkg-install pre-install: PKG_PREFIX=${PREFIX} ${SH} ${PKG_INSTALL} ${PKGNAME} PRE-INSTALL -.include +.include diff --git a/devel/simulavr/Makefile b/devel/simulavr/Makefile index 755eebdee2aa..0f3a97471776 100644 --- a/devel/simulavr/Makefile +++ b/devel/simulavr/Makefile @@ -45,10 +45,4 @@ do-install: done (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} install) -.include - -.if ${OSVERSION} < 500000 -BROKEN= "Does not compile" -.endif - -.include +.include diff --git a/devel/valgrind-snapshot/Makefile b/devel/valgrind-snapshot/Makefile index 3b2e00347937..35d05ab45509 100644 --- a/devel/valgrind-snapshot/Makefile +++ b/devel/valgrind-snapshot/Makefile @@ -33,29 +33,17 @@ WRKSRC= ${WRKDIR}/${DISTNAME} .include .if ${OSVERSION} >= 700000 -PLIST_SUB+= RELENG_4="@comment " PLIST_SUB+= RELENG_5="@comment " PLIST_SUB+= RELENG_6="@comment " PLIST_SUB+= RELENG_7="" -.else -.if ${OSVERSION} >= 600000 -PLIST_SUB+= RELENG_4="@comment " +.elif ${OSVERSION} >= 600000 PLIST_SUB+= RELENG_5="@comment " PLIST_SUB+= RELENG_6="" PLIST_SUB+= RELENG_7="@comment " .else -.if ${OSVERSION} >= 500000 -PLIST_SUB+= RELENG_4="@comment " PLIST_SUB+= RELENG_5="" PLIST_SUB+= RELENG_6="@comment " PLIST_SUB+= RELENG_7="@comment " -.else -PLIST_SUB+= RELENG_4="" -PLIST_SUB+= RELENG_5="@comment " -PLIST_SUB+= RELENG_6="@comment " -PLIST_SUB+= RELENG_7="@comment " -.endif -.endif .endif PROCFS!= /sbin/mount | ${GREP} '^procfs' | ${AWK} '{print $1}' diff --git a/devel/valgrind-snapshot/pkg-plist b/devel/valgrind-snapshot/pkg-plist index aa1453871c4b..6939056296e9 100644 --- a/devel/valgrind-snapshot/pkg-plist +++ b/devel/valgrind-snapshot/pkg-plist @@ -13,7 +13,6 @@ lib/valgrind/glibc-2.1.supp lib/valgrind/glibc-2.2.supp lib/valgrind/glibc-2.3.supp lib/valgrind/hp2ps -%%RELENG_4%%lib/valgrind/libc_r.so.4 %%RELENG_5%%lib/valgrind/libc_r.so.5 %%RELENG_5%%lib/valgrind/libkse.so.1 %%RELENG_5%%lib/valgrind/libpthread.so.1 diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile index 5a74afb3e3a3..091adbc89647 100644 --- a/devel/valgrind/Makefile +++ b/devel/valgrind/Makefile @@ -29,29 +29,17 @@ USE_PERL5_BUILD=yes .include .if ${OSVERSION} >= 700000 -PLIST_SUB+= RELENG_4="@comment " PLIST_SUB+= RELENG_5="@comment " PLIST_SUB+= RELENG_6="@comment " PLIST_SUB+= RELENG_7="" -.else -.if ${OSVERSION} >= 600000 -PLIST_SUB+= RELENG_4="@comment " +.elif ${OSVERSION} >= 600000 PLIST_SUB+= RELENG_5="@comment " PLIST_SUB+= RELENG_6="" PLIST_SUB+= RELENG_7="@comment " .else -.if ${OSVERSION} >= 500000 -PLIST_SUB+= RELENG_4="@comment " PLIST_SUB+= RELENG_5="" PLIST_SUB+= RELENG_6="@comment " PLIST_SUB+= RELENG_7="@comment " -.else -PLIST_SUB+= RELENG_4="" -PLIST_SUB+= RELENG_5="@comment " -PLIST_SUB+= RELENG_6="@comment " -PLIST_SUB+= RELENG_7="@comment " -.endif -.endif .endif PROCFS!= /sbin/mount | ${GREP} '^procfs' | ${AWK} '{print $1}' diff --git a/devel/valgrind/pkg-plist b/devel/valgrind/pkg-plist index 213c0d4828c1..34d0a398cd03 100644 --- a/devel/valgrind/pkg-plist +++ b/devel/valgrind/pkg-plist @@ -12,7 +12,6 @@ lib/valgrind/default.supp lib/valgrind/glibc-2.1.supp lib/valgrind/glibc-2.2.supp lib/valgrind/glibc-2.3.supp -%%RELENG_4%%lib/valgrind/libc_r.so.4 %%RELENG_5%%lib/valgrind/libc_r.so.5 %%RELENG_5%%lib/valgrind/libkse.so.1 %%RELENG_5%%lib/valgrind/libpthread.so.1 diff --git a/dns/doc/Makefile b/dns/doc/Makefile index 29e0bb06b483..6e40f6d7541e 100644 --- a/dns/doc/Makefile +++ b/dns/doc/Makefile @@ -20,12 +20,6 @@ AUX_FILES= doc-1.awk doc-3.awk doc-4.awk INFO RFC.XXXX MAN8= doc.8 -.include - -.if ${OSVERSION} < 500000 -IGNORE= requires DiG Version-9.x to run on 4.x -.endif - do-build: @${MV} ${WRKSRC}/doc ${WRKSRC}/doc.org @${SED} -e 's|$${PREFIX}|${PREFIX}|g' -e 's|$${AUX_DIR}|${AUX_DIR}|g' ${WRKSRC}/doc.org \ @@ -41,4 +35,4 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/doc.8 ${PREFIX}/man/man8/doc.8 .endif -.include +.include diff --git a/dns/firedns/Makefile b/dns/firedns/Makefile index c6b440bf23f6..035fe007c0f8 100644 --- a/dns/firedns/Makefile +++ b/dns/firedns/Makefile @@ -21,12 +21,6 @@ USE_BZIP2= yes HAS_CONFIGURE= yes INSTALLS_SHLIB= yes -.include - -.if ${OSVERSION} < 500000 -USE_GCC= 3.2+ -.endif - WRKSRC= ${WRKDIR}/${PORTNAME} MAN1= fdnscname.1 fdnsip.1 fdnsip6.1 fdnsip6list.1 fdnsiplist.1 fdnsmx.1 \ @@ -50,4 +44,4 @@ MAN3= firedns_aton4.3 firedns_aton6.3 firedns_dnsbl_lookup.3 \ pre-configure: @-${RM} ${WRKSRC}/firemake/*.orig -.include +.include diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile index 3b4ab1b1c01d..a1de585ed3bf 100644 --- a/dns/ldns/Makefile +++ b/dns/ldns/Makefile @@ -27,13 +27,9 @@ ALL_TARGET= all INSTALL_TARGET= install-lib install-h .if defined(WITH_DOCS) -.if ${OSVERSION} < 500000 -BROKEN= Doxygen fails to create manpages on 4.x -.endif - BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen ALL_TARGET+= doc -INSTALL_TARGET+= install-doc +INSTALL_TARGET+=install-doc NOMANCOMPRESS= true MANCOMPRESSED= no diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile index ced0e2082574..ec556b63183e 100644 --- a/dns/powerdns-recursor/Makefile +++ b/dns/powerdns-recursor/Makefile @@ -46,7 +46,7 @@ PLIST_SUB+= STATIC="@comment " EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-setuid .endif -.if exists(/usr/include/ucontext.h) && ${OSVERSION} >= 500000 +.if exists(/usr/include/ucontext.h) UCONTEXT!= ${AWK} '/setcontext/ { print "YES" }' \ /usr/include/ucontext.h .if ${UCONTEXT} == ""