diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2009-01-06 17:59:31 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2009-01-06 17:59:31 +0000 |
| commit | b2a96c6df1c8809216eced623ec37a8372b3216e (patch) | |
| tree | 0c994bc87e8a2f221a7e2be76b9aafc16eab32bb | |
| parent | 87b685f5d4325ba771e96b0ef49c71f903fb3ae0 (diff) | |
| download | ports-b2a96c6df1c8809216eced623ec37a8372b3216e.tar.gz ports-b2a96c6df1c8809216eced623ec37a8372b3216e.zip | |
Notes
162 files changed, 137 insertions, 1111 deletions
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile index 708a42043d60..a820cda6c01e 100644 --- a/deskutils/xneur/Makefile +++ b/deskutils/xneur/Makefile @@ -38,10 +38,4 @@ post-install: @for i in ${PREFIX}/etc/xneur/*.dist ;\ do ${CP} -np $$i $${i%.dist}; done -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -BROKEN= does not compile on FreeBSD 5.X -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile index 405772d12898..c4b20af7750e 100644 --- a/net-im/empathy/Makefile +++ b/net-im/empathy/Makefile @@ -33,14 +33,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= GNOME_Megaphone_Applet.schemas empathy.schemas -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= does not build on 5.X -.endif - post-patch: @${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR}|' \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile index 8ab16e928b46..d5b6069402e3 100644 --- a/net-im/gale/Makefile +++ b/net-im/gale/Makefile @@ -32,12 +32,6 @@ CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib \ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500039 -CFLAGS+= -DNEED_WCWIDTH -.endif - # cheesy hack - test-oop doesn't build, but we don't care. pre-configure: ${REINPLACE_CMD} -e 's/\(^noinst_PROGRAMS =.*\)test-oop/\1/' \ @@ -46,4 +40,4 @@ pre-configure: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/imspector/Makefile b/net-im/imspector/Makefile index 24042e7351cd..d3ffe7872a94 100644 --- a/net-im/imspector/Makefile +++ b/net-im/imspector/Makefile @@ -19,12 +19,6 @@ CONFIG_FILES= imspector.conf badwords.txt acl.txt USE_RC_SUBR= ${PORTNAME} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -BROKEN= does not compile, needs to fix /usr/include/net/pfvar.h -.endif - MAKE_ENV+= ETCDIR=${ETCDIR} post-patch: @@ -38,4 +32,4 @@ post-install: fi .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile index def938088d79..9d97e1731c2d 100644 --- a/net-im/kopete/Makefile +++ b/net-im/kopete/Makefile @@ -18,6 +18,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE multi-protocol instant messenger (IM) RUN_DEPENDS= ${QT_PREFIX}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls +LIB_DEPENDS= speex:${PORTSDIR}/audio/speex \ + ilbc:${PORTSDIR}/net/ilbc \ + ortp:${PORTSDIR}/net/ortp CONFLICTS= kdenetwork-[0-2]* kdenetwork-3.[0-4]* kdenetwork-3.5.[0-2]* kvirc-[0-9]* @@ -34,7 +37,16 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-ilbc=${LOCALBASE} \ --with-speex=${LOCALBASE} \ --with-ssl-dir=${OPENSSLBASE} \ - --without-external-libgadu + --without-external-libgadu \ + --enable-jingle +CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}" \ + EXPAT_CFLAGS="-I${LOCALBASE}/include" \ + EXPAT_LIBS="-L${LOCALBASE}/lib -lexpat" \ + ILBC_CFLAGS="-I${LOCALBASE}/include/ilbc" \ + ILBC_LIBS="-L${LOCALBASE}/lib -lilbc" \ + SPEEX_CFLAGS="$$(${PKG_CONFIG} --cflags speex)" \ + SPEEX_LIBS="$$(${PKG_CONFIG} --libs speex)" + USE_LDCONFIG= yes _NO_KDE_FINAL= yes @@ -47,20 +59,6 @@ PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if ${OSVERSION} > 500028 -CONFIGURE_ARGS+=--enable-jingle -LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex \ - ilbc:${PORTSDIR}/net/ilbc \ - ortp:${PORTSDIR}/net/ortp -CONFIGURE_ENV+= PKG_CONFIG="${PKG_CONFIG}" \ - EXPAT_CFLAGS="-I${LOCALBASE}/include" \ - EXPAT_LIBS="-L${LOCALBASE}/lib -lexpat" \ - ILBC_CFLAGS="-I${LOCALBASE}/include/ilbc" \ - ILBC_LIBS="-L${LOCALBASE}/lib -lilbc" \ - SPEEX_CFLAGS="$$(${PKG_CONFIG} --cflags speex)" \ - SPEEX_LIBS="$$(${PKG_CONFIG} --libs speex)" -.endif - post-patch: # force usage of gthread for libjingle's benefit @${REINPLACE_CMD} -E \ @@ -68,10 +66,6 @@ post-patch: ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} post-configure: -.if ${OSVERSION} < 500028 - @${REINPLACE_CMD} -e 's|$$(depcomp)||g' \ - ${WRKSRC}/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile -.endif # configure does not handle OSS support .for feature in \ FEATURE_ENABLE_CHAT_ARCHIVING \ diff --git a/net-mgmt/bsnmptools/Makefile b/net-mgmt/bsnmptools/Makefile index 2db29de634ee..058b91960d70 100644 --- a/net-mgmt/bsnmptools/Makefile +++ b/net-mgmt/bsnmptools/Makefile @@ -28,12 +28,6 @@ BIN_FILES= bsnmpget bsnmpset bsnmpwalk MAN1= ${BIN_FILES:S/$/.1/} MAN3= ${PORTNAME}.3 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600029 -IGNORE= does not compile on FreeBSD before 6.x -.endif - post-extract: @${CHMOD} -R u+w ${WRKSRC} @${MV} ${WRKSRC}/lib/libbsnmptools/libbsnmptools ${WRKSRC}/tlib @@ -44,4 +38,4 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's/usr.sbin/tools/' ${WRKSRC}/Makefile -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile index 79f663adca21..577acf846cf1 100644 --- a/net-mgmt/ettercap/Makefile +++ b/net-mgmt/ettercap/Makefile @@ -47,11 +47,6 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ LIBS="${LDFLAGS}" CONFIGURE_ARGS+= --enable-plugins -.if ${OSVERSION} < 502111 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap -CONFIGURE_ARGS+= --with-libpcap=${LOCALBASE} -.endif - .if !defined(WITHOUT_GTK) USE_GNOME= glib20 atk pango gtk20 PKGNAMESUFFIX+= -gtk2 diff --git a/net-mgmt/ipsectrace/Makefile b/net-mgmt/ipsectrace/Makefile index 20819245adbd..f007e6f71e4b 100644 --- a/net-mgmt/ipsectrace/Makefile +++ b/net-mgmt/ipsectrace/Makefile @@ -26,10 +26,4 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ipsectrace ${PREFIX}/bin/ipsectrace -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600032 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile index ee006cdc7602..042a6257d8ae 100644 --- a/net-mgmt/kismet/Makefile +++ b/net-mgmt/kismet/Makefile @@ -74,10 +74,6 @@ MAN5= kismet.conf.5 kismet_drone.conf.5 kismet_ui.conf.5 PORTDOCS+= README -.if ${OSVERSION} < 502000 -CONFIGURE_ARGS+= --disable-pcap -.endif - post-extract: .ifdef(WITH_GMAP) && defined(WITH_GPSMAP) @${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} diff --git a/net-mgmt/nagircbot/Makefile b/net-mgmt/nagircbot/Makefile index 9090f4a1f9e5..3552be0f41c4 100644 --- a/net-mgmt/nagircbot/Makefile +++ b/net-mgmt/nagircbot/Makefile @@ -19,10 +19,4 @@ USE_RC_SUBR= nagircbot PLIST_FILES= bin/nagircbot -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= need at least FreeBSD-6 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile index 7338a63f36b3..ee9ed602f7b4 100644 --- a/net-mgmt/net-snmp4/Makefile +++ b/net-mgmt/net-snmp4/Makefile @@ -17,7 +17,7 @@ COMMENT= An extendable SNMP implementation GNU_CONFIGURE= yes USE_PERL5= yes USE_LDCONFIG= yes -CFLAGS+= -fPIC +CFLAGS+= -fPIC -Dfreebsd5 CONFIGURE_ARGS+= --enable-shared \ --with-mib-modules="host ucd-snmp/diskio" \ @@ -100,10 +100,6 @@ OPTIONS= IPV6 "Enable IPv6 support" On .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 600000 -CFLAGS+= -Dfreebsd5 -.endif - .if defined(WITH_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .endif diff --git a/net-mgmt/send/Makefile b/net-mgmt/send/Makefile index 3b7603d12f42..754d3feabb8d 100644 --- a/net-mgmt/send/Makefile +++ b/net-mgmt/send/Makefile @@ -26,10 +26,6 @@ PORTDOCS= UserGuide.pdf .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -BROKEN= doesn't compile in FreeBSD < 6.0 -.endif - .if ${OSVERSION} > 700000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_pkixip__ext__asn.h .endif diff --git a/net-mgmt/snmp++/Makefile b/net-mgmt/snmp++/Makefile index effa8f5d195e..49b4939ffb78 100644 --- a/net-mgmt/snmp++/Makefile +++ b/net-mgmt/snmp++/Makefile @@ -24,10 +24,4 @@ USE_LDCONFIG= yes post-extract: ${CP} ${FILESDIR}/Makefile.FreeBSD ${WRKSRC} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= does not work on FreeBSD < 6 because of absence of gethostbyname_r -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/vidalia/Makefile b/net-mgmt/vidalia/Makefile index 5655ec549ffd..cc5f372fbf8c 100644 --- a/net-mgmt/vidalia/Makefile +++ b/net-mgmt/vidalia/Makefile @@ -39,12 +39,6 @@ OPTIONS= TOR_DEVEL "Depend on tor-devel" On \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -.if ${ARCH} == "amd64" -BROKEN= Does not compile on amd64 5, probably gcc-related -.endif -.endif - .if defined(WITH_TOR_DEVEL) .if defined(WITH_TOR) IGNORE= cannot depend on tor and tor-devel at the same time diff --git a/net-p2p/dctc/Makefile b/net-p2p/dctc/Makefile index 08fef5b6f2a8..114343b07744 100644 --- a/net-p2p/dctc/Makefile +++ b/net-p2p/dctc/Makefile @@ -56,10 +56,6 @@ DOC_FILES= COPYING ChangeLog INSTALL README \ .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 502000 && ${OSVERSION} < 502105 -BROKEN= "Does not compile" -.endif - post-extract: @${CP} ${FILESDIR}/lp_mutex.c ${WRKSRC}/src diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile index 95ad4d06e585..ef4b91173cb9 100644 --- a/net-p2p/libtorrent-rasterbar-14/Makefile +++ b/net-p2p/libtorrent-rasterbar-14/Makefile @@ -27,14 +27,8 @@ CONFLICTS= libtorrent-[0-9]* \ libtorrent-devel-[0-9]* \ rblibtorrent-[0-9]* -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -BROKEN= does not build on FreeBSD 5.x -.endif - post-install: @cd ${PREFIX}/lib && ${LN} -sf libtorrent-0.13.so libtorrent.so.2 && \ ${LN} -sf libtorrent.so.2 libtorrent.so -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile index 5f516d873f96..0f9e59b82f97 100644 --- a/net-p2p/mldonkey/Makefile +++ b/net-p2p/mldonkey/Makefile @@ -37,6 +37,8 @@ CONFIGURE_ENV+= \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" +# FreeBSD has reentrant dns code +PTHREAD_CFLAGS+= -D_REENTRANT ### ## Library dependency handling @@ -109,11 +111,6 @@ ALL_TARGET+= \ .include <bsd.port.pre.mk> -# FreeBSD has reentrant dns code -.if ( ((${OSVERSION} >= 504102) && (${OSVERSION} < 600000)) || (${OSVERSION} >= 600029) ) -PTHREAD_CFLAGS+= -D_REENTRANT -.endif - ### Development version ## Thus, we will use non standard threading library ## We will switch from libpthread to libthr which should produce diff --git a/net-p2p/mute-net/Makefile b/net-p2p/mute-net/Makefile index 861d80aca336..88f29f638036 100644 --- a/net-p2p/mute-net/Makefile +++ b/net-p2p/mute-net/Makefile @@ -19,6 +19,7 @@ COMMENT?= Peer-to-peer client with privacy protection and easy search/download USE_GMAKE= yes HAS_CONFIGURE= yes +USE_GCC= 3.3 USE_PERL5_BUILD=yes @@ -136,10 +137,6 @@ post-install: .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 502126 -USE_GCC= 3.3 -.endif - # we cannot install if either a slave or master port is already # installed CONFLICTS+= mute-net-[0-9]* diff --git a/net-p2p/rblibtorrent-devel/Makefile b/net-p2p/rblibtorrent-devel/Makefile index 95ad4d06e585..ef4b91173cb9 100644 --- a/net-p2p/rblibtorrent-devel/Makefile +++ b/net-p2p/rblibtorrent-devel/Makefile @@ -27,14 +27,8 @@ CONFLICTS= libtorrent-[0-9]* \ libtorrent-devel-[0-9]* \ rblibtorrent-[0-9]* -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -BROKEN= does not build on FreeBSD 5.x -.endif - post-install: @cd ${PREFIX}/lib && ${LN} -sf libtorrent-0.13.so libtorrent.so.2 && \ ${LN} -sf libtorrent.so.2 libtorrent.so -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/rblibtorrent/Makefile b/net-p2p/rblibtorrent/Makefile index 25a199a8f733..a559ae476cf5 100644 --- a/net-p2p/rblibtorrent/Makefile +++ b/net-p2p/rblibtorrent/Makefile @@ -26,14 +26,8 @@ CONFLICTS= libtorrent-[0-9]* \ libtorrent-devel-[0-9]* \ rblibtorrent-devel-[0-9]* -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -BROKEN= does not build on FreeBSD 5.x -.endif - post-install: @cd ${PREFIX}/lib && ${LN} -sf libtorrent-0.13.so libtorrent.so.1 && \ ${LN} -sf libtorrent.so.1 libtorrent.so -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile index 36853a86622c..924bdb9d91f8 100644 --- a/net/isc-dhcp30-server/Makefile +++ b/net/isc-dhcp30-server/Makefile @@ -192,11 +192,6 @@ PLIST_SUB+= LDAP="" PLIST_SUB+= LDAP="@comment " .endif REINPLACE_SUB= PREFIX=${PREFIX} -.if ${OSVERSION} >= 502100 -SUB_LIST+= NOLOGIN=/usr/sbin/nologin -.else -SUB_LIST+= NOLOGIN=/sbin/nologin -.endif .if !defined(WITHOUT_DHCP_PARANOIA) SUB_LIST+= PARANOIA=YES .else diff --git a/net/isc-dhcp30-server/files/isc-dhcpd.in b/net/isc-dhcp30-server/files/isc-dhcpd.in index 70ba25b92d99..c1e482945ad2 100644 --- a/net/isc-dhcp30-server/files/isc-dhcpd.in +++ b/net/isc-dhcp30-server/files/isc-dhcpd.in @@ -274,7 +274,7 @@ safe_useradd () local _user _group _home _shell _gecos _user=$1 _group=$2 _gecos=${3:-"& daemon"} - _home=${4:-/nonexistent} _shell=${5:-%%NOLOGIN%%} + _home=${4:-/nonexistent} _shell=${5:-/usr/sbin/nologin} if [ -n "${_group}" ]; then if pw group show ${_group} 2>/dev/null; then diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile index 80889dded7eb..194fcbe13a3b 100644 --- a/net/isc-dhcp31-server/Makefile +++ b/net/isc-dhcp31-server/Makefile @@ -148,11 +148,6 @@ DATADIR= /var/db PLIST_SUB+= SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}" PLIST_SUB+= LDAP="@comment " REINPLACE_SUB= PREFIX=${PREFIX} -.if ${OSVERSION} >= 502100 -SUB_LIST+= NOLOGIN=/usr/sbin/nologin -.else -SUB_LIST+= NOLOGIN=/sbin/nologin -.endif .if !defined(WITHOUT_DHCP_PARANOIA) SUB_LIST+= PARANOIA=YES .else diff --git a/net/isc-dhcp31-server/files/isc-dhcpd.in b/net/isc-dhcp31-server/files/isc-dhcpd.in index 70ba25b92d99..c1e482945ad2 100644 --- a/net/isc-dhcp31-server/files/isc-dhcpd.in +++ b/net/isc-dhcp31-server/files/isc-dhcpd.in @@ -274,7 +274,7 @@ safe_useradd () local _user _group _home _shell _gecos _user=$1 _group=$2 _gecos=${3:-"& daemon"} - _home=${4:-/nonexistent} _shell=${5:-%%NOLOGIN%%} + _home=${4:-/nonexistent} _shell=${5:-/usr/sbin/nologin} if [ -n "${_group}" ]; then if pw group show ${_group} 2>/dev/null; then diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile index 5efec3822b3c..1b0612f4d53d 100644 --- a/net/isc-dhcp40-server/Makefile +++ b/net/isc-dhcp40-server/Makefile @@ -185,11 +185,6 @@ PLIST_SUB+= LDAP="" PLIST_SUB+= LDAP="@comment " .endif REINPLACE_SUB= PREFIX=${PREFIX} -.if ${OSVERSION} >= 502100 -SUB_LIST+= NOLOGIN=/usr/sbin/nologin -.else -SUB_LIST+= NOLOGIN=/sbin/nologin -.endif .if !defined(WITHOUT_DHCP_PARANOIA) SUB_LIST+= PARANOIA=YES .else diff --git a/net/isc-dhcp40-server/files/isc-dhcpd.in b/net/isc-dhcp40-server/files/isc-dhcpd.in index 70ba25b92d99..c1e482945ad2 100644 --- a/net/isc-dhcp40-server/files/isc-dhcpd.in +++ b/net/isc-dhcp40-server/files/isc-dhcpd.in @@ -274,7 +274,7 @@ safe_useradd () local _user _group _home _shell _gecos _user=$1 _group=$2 _gecos=${3:-"& daemon"} - _home=${4:-/nonexistent} _shell=${5:-%%NOLOGIN%%} + _home=${4:-/nonexistent} _shell=${5:-/usr/sbin/nologin} if [ -n "${_group}" ]; then if pw group show ${_group} 2>/dev/null; then diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile index 82c3d78533f5..44e61638bcd2 100644 --- a/net/libnss-mysql/Makefile +++ b/net/libnss-mysql/Makefile @@ -21,9 +21,4 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_MYSQL= yes -.include <bsd.port.pre.mk> -.if ${OSVERSION} < 500112 -IGNORE= NSS modules only supported on FreeBSD 5.1 or later -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile index c05c9a6402e0..b8e85590d874 100644 --- a/net/linphone-base/Makefile +++ b/net/linphone-base/Makefile @@ -37,10 +37,6 @@ LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -LIB_DEPENDS+= readline.[5-9]:${PORTSDIR}/devel/readline -.endif - .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " diff --git a/net/mad_fcl/Makefile b/net/mad_fcl/Makefile index 9fbf0fbf2617..e4671d806da6 100644 --- a/net/mad_fcl/Makefile +++ b/net/mad_fcl/Makefile @@ -27,12 +27,6 @@ DOC_FILES= fdt-example.xml flute-sdp-example.sdp PORTDOCS= ${DOC_FILES} README.TXT PLIST_FILES= bin/flute -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 502120 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-alclib_defines.h -.endif - pre-patch: # Fixing the end-of-lines: for f in `${FIND} ${WRKSRC}/.. -type f` ; do \ @@ -53,4 +47,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README.TXT ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/mad_fcl/files/extra-patch-alclib_defines.h b/net/mad_fcl/files/extra-patch-alclib_defines.h deleted file mode 100644 index ec087dfb42bc..000000000000 --- a/net/mad_fcl/files/extra-patch-alclib_defines.h +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD: /tmp/pcvs/ports/net/mad_fcl/files/Attic/extra-patch-alclib_defines.h,v 1.1 2004-08-26 21:42:04 sem Exp $ - ---- alclib/defines.h.orig Fri Jun 25 13:18:59 2004 -+++ alclib/defines.h Fri Jun 25 13:35:11 2004 -@@ -29,7 +29,7 @@ - #define SSM - - /* Use ZLIB compression library */ --#define USE_ZLIB -+/*#define USE_ZLIB */ - - /* Use OpenSSL library for MD5*/ - #define USE_OPENSSL diff --git a/net/nocatsplash/Makefile b/net/nocatsplash/Makefile index 2fc767df26da..ac62afcfc57c 100644 --- a/net/nocatsplash/Makefile +++ b/net/nocatsplash/Makefile @@ -19,12 +19,6 @@ COMMENT= Open 802.11 Splash Screen USE_GNOME= glib12 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 502105 -IGNORE= Requires 5.x or later for pf(4) firewall support -.endif - CONFLICTS= nocatauth-server-* GNU_CONFIGURE= yes @@ -41,4 +35,4 @@ CONFIGURE_ARGS+= --with-mode=${AUTHMODE} CONFIGURE_ARGS+= --with-docroot=${DOCROOT} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile index 4c58cb6e622d..bbb11e8cc529 100644 --- a/net/openbgpd/Makefile +++ b/net/openbgpd/Makefile @@ -41,16 +41,6 @@ MAN8= bgpctl.8 \ SUBDIRS= bgpd \ bgpctl -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= requires strtonum in libc -.endif - -.if ${OSVERSION} < 500037 -IGNORE= requires macros present in <sys/tree.h> -.endif - post-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/if_media.h ${WRKSRC}/bgpctl/ @${CP} ${DISTDIR}/${DIST_SUBDIR}/hash.h ${WRKSRC}/bgpd/ @@ -96,4 +86,4 @@ post-install: @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/pfflowd/Makefile b/net/pfflowd/Makefile index 1fe3a47b767b..535c0ba64e44 100644 --- a/net/pfflowd/Makefile +++ b/net/pfflowd/Makefile @@ -21,10 +21,6 @@ PLIST_FILES= sbin/pfflowd .include <bsd.port.pre.mk> -.if ${OSVERSION} < 502119 -IGNORE= only for 5.3 and above -.endif - .if ${OSVERSION} < 700049 MAKE_ENV+= OLD_PFSYNC=1 EXTRA_PATCHES+= ${FILESDIR}/pf37-pfflowd.c diff --git a/net/pptpclient/Makefile b/net/pptpclient/Makefile index 07eb1be179cd..0456fce6482e 100644 --- a/net/pptpclient/Makefile +++ b/net/pptpclient/Makefile @@ -18,13 +18,7 @@ USE_PERL5= yes MAN8= pptp.8 -.include <bsd.port.pre.mk> - MAKE_ARGS= DEBUG="" -.if ${OSVERSION} < 500041 -MAKE_ARGS+= INCLUDE="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pptp ${PREFIX}/sbin @@ -33,4 +27,4 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/ppp.conf ${PREFIX}/share/examples/pptpclient ${INSTALL_MAN} ${WRKSRC}/pptp.8 ${PREFIX}/man/man8 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/proxychains/Makefile b/net/proxychains/Makefile index c7f62d164184..533249a893d7 100644 --- a/net/proxychains/Makefile +++ b/net/proxychains/Makefile @@ -18,10 +18,6 @@ USE_LDCONFIG= yes .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -BROKEN= Does not compile on 4.x and 5.x -.endif - .if ${OSVERSION} < 700017 EXTRA_PATCHES= ${PATCHDIR}/gethostbyaddr-proto-int .endif diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile index 302b22de5d10..f5268e510247 100644 --- a/net/py-pcap/Makefile +++ b/net/py-pcap/Makefile @@ -24,10 +24,4 @@ USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes PYDISTUTILS_PKGNAME= pylibpcap -.include <bsd.port.pre.mk> - -.if ( ${OSVERSION} < 500038 ) -IGNORE= needs libpcap 0.7 or higher -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/py-twitter/Makefile b/net/py-twitter/Makefile index 84ac201b82b8..ab0746335ce8 100644 --- a/net/py-twitter/Makefile +++ b/net/py-twitter/Makefile @@ -24,10 +24,4 @@ USE_PYTHON= yes USE_PYDISTUTILS= easy_install PYDISTUTILS_PKGNAME= python_twitter -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -BROKEN= Leaves egg file behind on deinstall -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/quagga/Makefile b/net/quagga/Makefile index a25546b7dc80..661639579093 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -129,17 +129,7 @@ SUB_LIST= RCLDCONFIG=ldconfig SUB_LIST= RCLDCONFIG= .endif -.if ${OSVERSION} < 600000 -BUILD_DEPENDS+=${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo -CONFIGURE_ENV+=MAKEINFO=${LOCALBASE}/bin/makeinfo -.endif - -USE_RC_SUBR= watchquagga.sh -.if ${OSVERSION} >= 600101 -USE_RC_SUBR+= quagga.sh -.else -USE_RCORDER= quagga.sh -.endif +USE_RC_SUBR= quagga.sh watchquagga.sh SUB_LIST+= LOCALSTATE_DIR=${LOCALSTATE_DIR} \ SYSCONF_DIR=${SYSCONF_DIR} diff --git a/net/relayd/Makefile b/net/relayd/Makefile index 7aec37473953..46032fdc179a 100644 --- a/net/relayd/Makefile +++ b/net/relayd/Makefile @@ -53,9 +53,6 @@ do-install: .include <bsd.port.pre.mk> -.if ${OSVERSION} < 502106 -IGNORE= is of no use for you because your system is too old and doesn't have pf -.endif .if (${OSVERSION} < 700049) && !defined(I_KNOW_WHAT_I_AM_DOING) IGNORE= needs a patched kernel to work correctly (http://www.openbsd.org/cgi-bin/cvsweb/src/sys/net/pf_table.c.diff?r1=1.67&r2=1.68) .endif diff --git a/net/samba3/Makefile b/net/samba3/Makefile index 2c3d619b730f..929a0b124cf3 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -169,12 +169,8 @@ CONFIGURE_ARGS+= --without-utmp CONFIGURE_ARGS+= --with-winbind PLIST_SUB+= WINBIND="" SUB_LIST+= WINBIND="" -. if ${OSVERSION} >= 500112 WITH_WINBIND_NSS= yes PLIST_SUB+= WINBIND_NSS="" -. else -PLIST_SUB+= WINBIND_NSS="@comment " -. endif .else CONFIGURE_ARGS+= --without-winbind PLIST_SUB+= WINBIND="@comment " WINBIND_NSS="@comment " @@ -213,9 +209,6 @@ CONFIGURE_ARGS+= --disable-fam .endif .if defined(WITH_ACL_SUPPORT) -.if ${OSVERSION} < 500018 -IGNORE= an ACL support requires 5.1-RELEASE or later. Disable ACL support -.endif CONFIGURE_ARGS+= --with-acl-support .else CONFIGURE_ARGS+= --without-acl-support @@ -405,8 +398,8 @@ pre-configure: @${FIND} ${WRKDIR}/${DISTNAME} -type d | ${XARGS} ${CHMOD} u+w,a+rx @${FIND} ${WRKDIR}/${DISTNAME} -type f | ${XARGS} ${CHMOD} u+w,a+r -# This would speedup compilation for gcc 3.4(available in FreeBSD 5.2) and higher -.if !defined(WITHOUT_PCH) && ${OSVERSION} >= 502126 +# This would speedup compilation +.if !defined(WITHOUT_PCH) pre-build: cd ${WRKSRC} && ${MAKE} pch .endif diff --git a/net/samba32-devel/Makefile b/net/samba32-devel/Makefile index d24b81f93667..187fa216b089 100644 --- a/net/samba32-devel/Makefile +++ b/net/samba32-devel/Makefile @@ -157,12 +157,8 @@ CONFIGURE_ARGS+= --without-utmp CONFIGURE_ARGS+= --with-winbind PLIST_SUB+= WINBIND="" SUB_LIST+= WINBIND="" -. if ${OSVERSION} >= 500112 WITH_WINBIND_NSS= yes PLIST_SUB+= WINBIND_NSS="" -. else -PLIST_SUB+= WINBIND_NSS="@comment " -. endif .else CONFIGURE_ARGS+= --without-winbind PLIST_SUB+= WINBIND="@comment " WINBIND_NSS="@comment " @@ -198,9 +194,6 @@ CONFIGURE_ARGS+= --disable-fam .endif .if defined(WITH_ACL_SUPPORT) -.if ${OSVERSION} < 500018 -IGNORE= an ACL support requires 5.1-RELEASE or later. Disable ACL support -.endif CONFIGURE_ARGS+= --with-acl-support .else CONFIGURE_ARGS+= --without-acl-support diff --git a/net/samba32/Makefile b/net/samba32/Makefile index d24b81f93667..187fa216b089 100644 --- a/net/samba32/Makefile +++ b/net/samba32/Makefile @@ -157,12 +157,8 @@ CONFIGURE_ARGS+= --without-utmp CONFIGURE_ARGS+= --with-winbind PLIST_SUB+= WINBIND="" SUB_LIST+= WINBIND="" -. if ${OSVERSION} >= 500112 WITH_WINBIND_NSS= yes PLIST_SUB+= WINBIND_NSS="" -. else -PLIST_SUB+= WINBIND_NSS="@comment " -. endif .else CONFIGURE_ARGS+= --without-winbind PLIST_SUB+= WINBIND="@comment " WINBIND_NSS="@comment " @@ -198,9 +194,6 @@ CONFIGURE_ARGS+= --disable-fam .endif .if defined(WITH_ACL_SUPPORT) -.if ${OSVERSION} < 500018 -IGNORE= an ACL support requires 5.1-RELEASE or later. Disable ACL support -.endif CONFIGURE_ARGS+= --with-acl-support .else CONFIGURE_ARGS+= --without-acl-support diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile index ed61891d6606..1682031f1086 100644 --- a/net/siproxd/Makefile +++ b/net/siproxd/Makefile @@ -27,9 +27,7 @@ PORTDOCS= ${PORTDOCS1} ${PORTDOCS2} .include <bsd.port.pre.mk> post-patch: -.if ${OSVERSION} >= 500041 @${REINPLACE_CMD} -e 's,-lgnugetopt,,g' ${WRKSRC}/${CONFIGURE_SCRIPT} -.endif .if !defined(NOPORTDOCS) @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/doc/siproxd.conf.example diff --git a/net/slbd/Makefile b/net/slbd/Makefile index b1f0d53e4822..50ccaa0c5f72 100644 --- a/net/slbd/Makefile +++ b/net/slbd/Makefile @@ -27,10 +27,4 @@ post-install: cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 502106 -IGNORE= is of no use for you because your system is too old and doesn't have pf -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/wire/Makefile b/net/wire/Makefile index 334ae72ae07c..58f545bd21df 100644 --- a/net/wire/Makefile +++ b/net/wire/Makefile @@ -25,7 +25,7 @@ MAN1= wire.1 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500018 || exists(${LOCALBASE}/lib/libreadline.so.5) +.if exists(${LOCALBASE}/lib/libreadline.so.5) LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline .endif diff --git a/net/wmwave/Makefile b/net/wmwave/Makefile index c32f579d1deb..70a5f515eea4 100644 --- a/net/wmwave/Makefile +++ b/net/wmwave/Makefile @@ -35,10 +35,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600007 -IGNORE= needs API available in FreeBSD 6.X and later -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/wmwlmon/Makefile b/net/wmwlmon/Makefile index 3ef2a36ab738..63b5ccc8a3a5 100644 --- a/net/wmwlmon/Makefile +++ b/net/wmwlmon/Makefile @@ -22,9 +22,7 @@ PLIST_FILES= bin/wmwlmon .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600100 -IGNORE= needs WLAN infrastructure from 6.0-RELEASE or newer -.elif ${OSVERSION} >= 700052 +.if ${OSVERSION} >= 700052 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-wl.c ${PATCHDIR}/extra-patch-wmwlmon.1 pre-everything:: @${ECHO_CMD} "===========================================================" diff --git a/net/xmlrpc++/Makefile b/net/xmlrpc++/Makefile index 78722f7e26ba..94c0db60541e 100644 --- a/net/xmlrpc++/Makefile +++ b/net/xmlrpc++/Makefile @@ -20,13 +20,6 @@ COMMENT= A C++ implementation of the XML-RPC protocol USE_GCC= 3.4 USE_GMAKE= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 501103 -# Work around bsd.port.mk bug: Does not currently set up MAKE_ENV for gcc 3.2 and 3.3 -MAKE_ENV+= CC="${CC}" CXX="${CXX}" -.endif - post-patch: @${REINPLACE_CMD} -e "s|^CXX|#CXX|" -e "s|^CXXFLAGS|#CXXFLAGS|" \ -e "s|tests$$||" ${WRKSRC}/Makefile @@ -36,4 +29,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/src/XmlRpc*.h ${PREFIX}/include/xmlrpc++ ${INSTALL_PROGRAM} ${WRKSRC}/libXmlRpc.a ${PREFIX}/lib -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/yate-devel/Makefile b/net/yate-devel/Makefile index 967ab1475e70..32b6c668bece 100644 --- a/net/yate-devel/Makefile +++ b/net/yate-devel/Makefile @@ -120,12 +120,6 @@ PLIST_SUB+= WITH_FAX="" PLIST_SUB+= WITH_FAX="@comment " .endif -.if ${OSVERSION} >= 500036 -PLIST_SUB+= NEWGCC="" -.else -PLIST_SUB+= NEWGCC="@comment " -.endif - post-patch: ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ ${WRKSRC}/modules/Makefile.in diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile index b358194789c2..702657b3208f 100644 --- a/news/hellanzb/Makefile +++ b/news/hellanzb/Makefile @@ -28,8 +28,8 @@ USE_PYDISTUTILS=yes .include <bsd.port.pre.mk> -# more fully-featured rar needs at least 5.3 -.if ${ARCH} == "i386" && ${OSVERSION} >= 503000 +# more fully-featured rar needs i386 +.if ${ARCH} == "i386" RUN_DEPENDS+= rar:${PORTSDIR}/archivers/rar .else RUN_DEPENDS+= unrar:${PORTSDIR}/archivers/unrar diff --git a/news/nntpswitch/Makefile b/news/nntpswitch/Makefile index 24d1b030d609..6e20de914091 100644 --- a/news/nntpswitch/Makefile +++ b/news/nntpswitch/Makefile @@ -54,11 +54,6 @@ ALL_TARGET+= ldap PLIST_FILES+= lib/${PORTNAME}/auth_ldap.so .endif -.include <bsd.port.pre.mk> -.if ${OSVERSION} < 500029 -BROKEN= "${PORTNAME} requires atoll(3)" -.endif - do-configure: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/nntpswitch.conf.in @@ -70,4 +65,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/nntpswitch.conf-dist ${ETC_DIR}/ ${INSTALL_SCRIPT} ${FILESDIR}/nntpswitch.sh ${PREFIX}/etc/rc.d/nntpswitch.sh-dist -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/palm/uppc-kmod/Makefile b/palm/uppc-kmod/Makefile index 692816e87ecf..c1932a869522 100644 --- a/palm/uppc-kmod/Makefile +++ b/palm/uppc-kmod/Makefile @@ -27,9 +27,6 @@ IGNORE= Requires kernel source (/usr/src/sys) to build post-build: @${REINPLACE_CMD} -e 's|%%INITIAL_INSTALLDIR%%|${PREFIX}/lib|g' ${BUILD_WRKSRC}/uppcsetup @${REINPLACE_CMD} -e 's|%%INITIAL_MODDIR%%|${KMODDIR}|g' ${WRKSRC}/uppcsetup -.if ${OSVERSION} < 600000 - @${REINPLACE_CMD} -e 's|cuaU|ucom|' ${WRKSRC}/uppcsetup -.endif do-install: ${INSTALL_KLD} ${WRKSRC}/uppc.ko ${PREFIX}/lib diff --git a/ports-mgmt/jailaudit/Makefile b/ports-mgmt/jailaudit/Makefile index 1081a43d61c4..e123f5aba28c 100644 --- a/ports-mgmt/jailaudit/Makefile +++ b/ports-mgmt/jailaudit/Makefile @@ -25,10 +25,4 @@ PLIST_SUB+= PERIODICDIR="${PERIODICDIR:S,^${PREFIX}/,,}" \ REPORTDIR="${REPORTDIR:S,^${PREFIX}/,,}" \ TMPDIR="${TMPDIR:S,^${PREFIX}/,,}" -.include <bsd.port.pre.mk> - -.if ( ${OSVERSION} < 501000 ) -IGNORE= needs the jls utility which was added in FreeBSD 5.1 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/ports-mgmt/pkg_install/Makefile b/ports-mgmt/pkg_install/Makefile index 0da84c100a51..1ade816e3252 100644 --- a/ports-mgmt/pkg_install/Makefile +++ b/ports-mgmt/pkg_install/Makefile @@ -16,21 +16,15 @@ MAINTAINER= portmgr@FreeBSD.org COMMENT= FreeBSD -STABLE version of the package tools MANCOMPRESSED= yes - MAN1= pkg_add.1 pkg_create.1 pkg_delete.1 \ pkg_info.1 pkg_updating.1 pkg_version.1 +MAKE_ARGS= -DNO_OBJ -DNO_CRYPT -DNO_OPENSSL + OPTIONS= WRAPPER "Use ports version instead of base if more recent" on .include <bsd.port.pre.mk> -# Arbitrary OSVERSION but support for 5.x will go away soon anyway... -.if ${OSVERSION} < 600000 -MAKE_ARGS= -DNOOBJ -DNOCRYPT -DNO_OPENSSL -.else -MAKE_ARGS= -DNO_OBJ -DNO_CRYPT -DNO_OPENSSL -.endif - pre-configure: @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ -e 's,%%MANPREFIX%%,${MANPREFIX},g' \ diff --git a/ports-mgmt/pkg_trackinst/Makefile b/ports-mgmt/pkg_trackinst/Makefile index d93855212296..e2c9a87ae0ba 100644 --- a/ports-mgmt/pkg_trackinst/Makefile +++ b/ports-mgmt/pkg_trackinst/Makefile @@ -16,14 +16,8 @@ USE_PYTHON= 2.3+ INSTALLS_EGGINFO= yes MAKE_ENV= PYTHON_CMD=${PYTHON_CMD} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 501105 -IGNORE= requires dynamically-linked base programs -.endif - post-patch: ${REINPLACE_CMD} 's,/usr/local,${PREFIX},g' \ ${WRKSRC}/PkgTrackInst/cmd_support.py -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/ports-mgmt/pkgfe/Makefile b/ports-mgmt/pkgfe/Makefile index 3667217cff76..d00bfd7e9d61 100644 --- a/ports-mgmt/pkgfe/Makefile +++ b/ports-mgmt/pkgfe/Makefile @@ -21,12 +21,6 @@ RUN_DEPENDS= portupgrade:${PORTSDIR}/ports-mgmt/portupgrade \ MAN8= pkgfe.8 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600033 && ( ${OSVERSION} < 504103 || ${OSVERSION} > 600000 ) -RUN_DEPENDS+= portsnap:${PORTSDIR}/ports-mgmt/portsnap -.endif - NO_BUILD= yes do-install: @@ -40,4 +34,4 @@ post-install: ${CP} -p ${PREFIX}/etc/pkgfe.conf.sample ${PREFIX}/etc/pkgfe.conf ; \ fi -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile index c53d09090598..f3366b56d1ce 100644 --- a/print/lyx-devel/Makefile +++ b/print/lyx-devel/Makefile @@ -113,9 +113,7 @@ QT_PRESENT= on QT_PRESENT= off .endif -.if ${OSVERSION} < 500035 -CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30 -.elif ${OSVERSION} >= 700007 && ${ARCH} == i386 && ${CXX} == c++ +.if ${OSVERSION} >= 700007 && ${ARCH} == i386 && ${CXX} == c++ #BROKEN= C++ compiler seg-faults, try using a different one and report to ${MAINTAINER} .endif diff --git a/print/lyx/Makefile b/print/lyx/Makefile index c53d09090598..f3366b56d1ce 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -113,9 +113,7 @@ QT_PRESENT= on QT_PRESENT= off .endif -.if ${OSVERSION} < 500035 -CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30 -.elif ${OSVERSION} >= 700007 && ${ARCH} == i386 && ${CXX} == c++ +.if ${OSVERSION} >= 700007 && ${ARCH} == i386 && ${CXX} == c++ #BROKEN= C++ compiler seg-faults, try using a different one and report to ${MAINTAINER} .endif diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile index c53d09090598..f3366b56d1ce 100644 --- a/print/lyx14/Makefile +++ b/print/lyx14/Makefile @@ -113,9 +113,7 @@ QT_PRESENT= on QT_PRESENT= off .endif -.if ${OSVERSION} < 500035 -CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30 -.elif ${OSVERSION} >= 700007 && ${ARCH} == i386 && ${CXX} == c++ +.if ${OSVERSION} >= 700007 && ${ARCH} == i386 && ${CXX} == c++ #BROKEN= C++ compiler seg-faults, try using a different one and report to ${MAINTAINER} .endif diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile index c53d09090598..f3366b56d1ce 100644 --- a/print/lyx16/Makefile +++ b/print/lyx16/Makefile @@ -113,9 +113,7 @@ QT_PRESENT= on QT_PRESENT= off .endif -.if ${OSVERSION} < 500035 -CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30 -.elif ${OSVERSION} >= 700007 && ${ARCH} == i386 && ${CXX} == c++ +.if ${OSVERSION} >= 700007 && ${ARCH} == i386 && ${CXX} == c++ #BROKEN= C++ compiler seg-faults, try using a different one and report to ${MAINTAINER} .endif diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index da27fb07eec8..7ce74074986d 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -42,10 +42,6 @@ MANLANG= "" pl pl_PL.UTF-8 pl_PL.ISO8859-2 de de_DE.UTF-8 \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500035 -CXXFLAGS+= -fpermissive -.endif - post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g; \ s|-O2 ||g ; \ diff --git a/print/scribus/Makefile b/print/scribus/Makefile index da27fb07eec8..7ce74074986d 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -42,10 +42,6 @@ MANLANG= "" pl pl_PL.UTF-8 pl_PL.ISO8859-2 de de_DE.UTF-8 \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500035 -CXXFLAGS+= -fpermissive -.endif - post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g; \ s|-O2 ||g ; \ diff --git a/russian/xneur/Makefile b/russian/xneur/Makefile index 708a42043d60..a820cda6c01e 100644 --- a/russian/xneur/Makefile +++ b/russian/xneur/Makefile @@ -38,10 +38,4 @@ post-install: @for i in ${PREFIX}/etc/xneur/*.dist ;\ do ${CP} -np $$i $${i%.dist}; done -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -BROKEN= does not compile on FreeBSD 5.X -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/science/cdo/Makefile b/science/cdo/Makefile index 46c1d747e48f..14865fd6793b 100644 --- a/science/cdo/Makefile +++ b/science/cdo/Makefile @@ -29,7 +29,7 @@ OPTIONS= NETCDF "NETCDF support" off .include <bsd.port.pre.mk> -.if (${OSVERSION} > 700000) || (${ARCH} != "sparc64" && ${OSVERSION} > 600000) +.if (${OSVERSION} > 700000) || (${ARCH} != "sparc64") CONFIGURE_ENV+= CFLAGS="${CFLAGS} -DPTHREAD_MUTEXATTR_CONDATTR" .endif diff --git a/science/openfoam/Makefile b/science/openfoam/Makefile index 7d6fca994264..84c6acf8dfda 100644 --- a/science/openfoam/Makefile +++ b/science/openfoam/Makefile @@ -133,10 +133,6 @@ PLIST_SUB+= MPI="openmpi" MPI_VER=${OMPI_VERSION} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -BROKEN= Fails to compile (abort trap) -.endif - .if exists(${LOCALBASE}/bin/mico-config) MICO_VER= `${LOCALBASE}/bin/mico-config --version` .else diff --git a/security/bdc/Makefile b/security/bdc/Makefile index 9d07b1f1255f..55406aac4942 100644 --- a/security/bdc/Makefile +++ b/security/bdc/Makefile @@ -15,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.2-fbsd${BDREL} MAINTAINER= itetcu@FreeBSD.org COMMENT= BitDefender Console Antivirus for FreeBSD +LIB_DEPENDS= c.5:${PORTSDIR}/misc/compat5x + WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes @@ -23,16 +25,9 @@ PKGMESSAGE= ${WRKDIR}/pkg-message ONLY_FOR_ARCHS= i386 RESTRICTED= License prohibits redistribution -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 600000 -LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x -.endif -.if ${OSVERSION} < 502001 -IGNORE= requires FreeBSD 5.2.1 or later -.else BDREL= 5 -.endif + +.include <bsd.port.pre.mk> .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) ECHO_MSG= /usr/bin/printf diff --git a/security/bioapi/Makefile b/security/bioapi/Makefile index a46d1e439f8b..b8d592856532 100644 --- a/security/bioapi/Makefile +++ b/security/bioapi/Makefile @@ -24,10 +24,4 @@ CONFIGURE_ARGS= --localstatedir=/var/db/ --with-Qt-dir=no USE_LDCONFIG= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= needs at least FreeBSD 6.0-RELEASE -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/bruteforceblocker/Makefile b/security/bruteforceblocker/Makefile index a20fbfb9a5a1..295f23ff9154 100644 --- a/security/bruteforceblocker/Makefile +++ b/security/bruteforceblocker/Makefile @@ -27,12 +27,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 502106 -IGNORE= requires at least FreeBSD 5.2 -.endif - do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/sbin/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf-dist @@ -51,4 +45,4 @@ post-install: @${CAT} ${PKGMESSAGE} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile index 54e2f52300d9..2b9c70f3ac20 100644 --- a/security/cyrus-sasl2-saslauthd/Makefile +++ b/security/cyrus-sasl2-saslauthd/Makefile @@ -77,28 +77,19 @@ CONFIGURE_ARGS+=--enable-httpform CONFIGURE_ARGS+=--enable-gssapi=${KRB5_HOME} --with-gss_impl=mit .elif !defined(WITHOUT_GSSAPI) && defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a) CONFIGURE_ARGS+=--enable-gssapi=${HEIMDAL_HOME} --with-gss_impl=heimdal -.elif !defined(WITHOUT_GSSAPI) && ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(/usr/lib/libkrb5.a) +.elif !defined(WITHOUT_GSSAPI) && exists(/usr/lib/libkrb5.a) CONFIGURE_ARGS+=--enable-gssapi .else CONFIGURE_ARGS+=--disable-gssapi .endif # KERBEROS 4 was removed in FreeBSD 5.0-CURRENT -.if ${OSVERSION} > 500105 .if defined(WITH_KERBEROS4) LIB_DEPENDS+= krb.2:${PORTSDIR}/security/krb4 CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4 .else CONFIGURE_ARGS+=--disable-krb4 .endif -.elif exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(WITHOUT_KERBEROS4) -CONFIGURE_ARGS+=--enable-krb4 -.elif !exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4) -LIB_DEPENDS+= krb.2:${PORTSDIR}/security/krb4 -CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4 -.else -CONFIGURE_ARGS+=--disable-krb4 -.endif .if ${OPENSSLBASE} == /usr CONFIGURE_ARGS+=--with-openssl=yes diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 1c568d31fe79..83d4ee954577 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -170,7 +170,7 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CONFIGURE_ARGS+=--enable-gssapi=${KRB5_HOME} --with-gss_impl=mit .elif !defined(WITHOUT_GSSAPI) && defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a) CONFIGURE_ARGS+=--enable-gssapi=${HEIMDAL_HOME} --with-gss_impl=heimdal -.elif !defined(WITHOUT_GSSAPI) && ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(/usr/lib/libkrb5.a) +.elif !defined(WITHOUT_GSSAPI) && exists(/usr/lib/libkrb5.a) CONFIGURE_ARGS+=--enable-gssapi .else CONFIGURE_ARGS+=--disable-gssapi @@ -178,7 +178,6 @@ GSSAPI= "@comment " .endif # KERBEROS 4 was removed in FreeBSD 5.0-CURRENT -.if ${OSVERSION} > 500105 .if defined(WITH_KERBEROS4) LIB_DEPENDS+= krb.2:${PORTSDIR}/security/krb4 CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4 @@ -186,15 +185,6 @@ CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4 CONFIGURE_ARGS+=--disable-krb4 EBONES= "@comment " .endif -.elif exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(WITHOUT_KERBEROS4) -CONFIGURE_ARGS+=--enable-krb4 -.elif !exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4) -LIB_DEPENDS+= krb.2:${PORTSDIR}/security/krb4 -CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4 -.else -CONFIGURE_ARGS+=--disable-krb4 -EBONES= "@comment " -.endif .if ${OPENSSLBASE} == /usr CONFIGURE_ARGS+=--with-openssl=yes diff --git a/security/expiretable/Makefile b/security/expiretable/Makefile index f145123da220..67ac06be9bce 100644 --- a/security/expiretable/Makefile +++ b/security/expiretable/Makefile @@ -16,10 +16,4 @@ COMMENT= Utility to remove entries from the pf(4) table based on their age USE_RC_SUBR= expiretable MAN1= expiretable.1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 502106 -IGNORE= is only for 5.3 and above (requires pf library) -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/freebsd-update/Makefile b/security/freebsd-update/Makefile index 892447283507..84d77361244f 100644 --- a/security/freebsd-update/Makefile +++ b/security/freebsd-update/Makefile @@ -16,10 +16,6 @@ COMMENT= Fetches and installs binary updates to FreeBSD .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600034 && ( ${OSVERSION} < 504104 || ${OSVERSION} > 599999 ) -RUN_DEPENDS= bspatch:${PORTSDIR}/misc/bsdiff -.endif - .if ${OSVERSION} > 700019 || ( ${OSVERSION} > 601104 && ${OSVERSION} < 700000 ) IGNORE= is now contained in the base system .endif diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile index 560aa4bfb662..b8f853c5def7 100644 --- a/security/gnupg1/Makefile +++ b/security/gnupg1/Makefile @@ -95,11 +95,6 @@ post-install: .if defined(WITH_SUID_GPG) ${CHMOD} u+s ${PREFIX}/bin/gpg .endif -.if ${OSVERSION} < 500019 - @${CAT} ${PKGMESSAGE} -.else -PKGMESSAGE= /nonexistent -.endif check: (cd ${WRKSRC}; ${MAKE} check) diff --git a/security/gnupg1/pkg-message b/security/gnupg1/pkg-message deleted file mode 100644 index 6123fa32f234..000000000000 --- a/security/gnupg1/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -************************************************************ -TIPS: - o Use rndcontrol(8) if you want more entropy. - See http://people.freebsd.org/~dougb/randomness.html for more details. -************************************************************ diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 677773fe6f7c..79ba7b5e63ca 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -50,11 +50,6 @@ CONFIGURE_ARGS+= --with-lzo CONFIGURE_ARGS+= --with-lzo=no .endif -.if ${OSVERSION} < 600000 -BUILD_DEPENDS+= ${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo -CONFIGURE_ENV+= MAKEINFO="${LOCALBASE}/bin/makeinfo" -.endif - .if defined(WITHOUT_CXX) CONFIGURE_ARGS+= --disable-cxx PLIST_SUB+= CXX="@comment " diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index 99d4a2f54947..a2b1ea6d6a97 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -49,7 +49,7 @@ post-patch: @${REINPLACE_CMD} -e 's|^clfilesdir.*|clfilesdir=$$\(libdir\)/common-lisp/gpgme|g' \ ${WRKSRC}/lang/cl/Makefile.in .if defined(WITH_PTH) -.if ${OSVERSION} < 503100 || defined(PTHREAD_LIBS) && ${PTHREAD_LIBS} != "-pthread" +.if defined(PTHREAD_LIBS) && ${PTHREAD_LIBS} != "-pthread" @${REINPLACE_CMD} -e 's|t_thread1_LDADD = ../../gpgme/libgpgme-pthread.la|t_thread1_LDADD = ../../gpgme/libgpgme-pthread.la -lpthread|g' \ ${WRKSRC}/tests/gpg/Makefile.in .endif diff --git a/security/ike/Makefile b/security/ike/Makefile index 35da834062ed..1a9d03c6b9d8 100644 --- a/security/ike/Makefile +++ b/security/ike/Makefile @@ -57,10 +57,7 @@ post-patch: .ifdef(WITH_NATT) @${ECHO_MSG} "===> -------------------------------------------------------------------------" @${ECHO_MSG} "===> ATTENTION: You need a kernel patch to enable NAT-Traversal functionality!" -. if ${OSVERSION} < 600000 - @${ECHO_MSG} "===> There is no known NAT-T patch for FreeBSD 1 - 5!!!" -. endif -. if ${OSVERSION} > 600000 && ${OSVERSION} < 699999 +. if ${OSVERSION} < 699999 @${ECHO_MSG} "===> http://ipsec-tools.sf.net/freebsd6-natt.diff" . endif . if ${OSVERSION} > 700000 && ${OSVERSION} < 799999 diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile index cb4afe40aaca..ae0cbee54b81 100644 --- a/security/libfprint/Makefile +++ b/security/libfprint/Makefile @@ -24,14 +24,8 @@ USE_LDCONFIG= yes USE_OPENSSL= yes USE_GNOME= glib20 pkgconfig -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-FreeBSD5 -.endif - CONFIGURE_ENV+= CRYPTO_CFLAGS=-I${OPENSSLINC} \ CRYPTO_LIBS=-lcrypto \ CFLAGS="${CFLAGS} -DHAVE_MEMMEM" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/libfprint/files/extra-patch-FreeBSD5 b/security/libfprint/files/extra-patch-FreeBSD5 deleted file mode 100644 index f804d8d4643d..000000000000 --- a/security/libfprint/files/extra-patch-FreeBSD5 +++ /dev/null @@ -1,31 +0,0 @@ ---- libfprint/drivers/upekts.c.orig 2008-04-29 22:04:53.000000000 +0200 -+++ libfprint/drivers/upekts.c 2008-04-29 22:11:18.000000000 +0200 -@@ -35,6 +35,8 @@ - - #include <fp_internal.h> - -+#include "libfprint/errno_compat.h" -+ - #define EP_IN (1 | USB_ENDPOINT_IN) - #define EP_OUT (2 | USB_ENDPOINT_OUT) - #define TIMEOUT 5000 ---- libfprint/drivers/uru4000.c.orig 2008-04-29 22:04:44.000000000 +0200 -+++ libfprint/drivers/uru4000.c 2008-04-29 22:11:33.000000000 +0200 -@@ -28,6 +28,8 @@ - - #include <fp_internal.h> - -+#include "libfprint/errno_compat.h" -+ - #define EP_INTR (1 | USB_ENDPOINT_IN) - #define EP_DATA (2 | USB_ENDPOINT_IN) - #define USB_RQ 0x04 ---- libfprint/errno_compat.h.orig 2008-04-29 22:30:31.550769000 +0200 -+++ libfprint/errno_compat.h 2008-04-29 22:30:31.550769000 +0200 -@@ -0,0 +1,6 @@ -+#ifndef _ERRNO_COMPAT_H_ -+#define _ERRNO_COMPAT_H_ -+ -+#define EPROTO 92 -+ -+#endif /* _ERRNO_COMPAT_H_ */ diff --git a/security/ncrypt/Makefile b/security/ncrypt/Makefile index 31294adc8168..31c3f415991b 100644 --- a/security/ncrypt/Makefile +++ b/security/ncrypt/Makefile @@ -21,14 +21,8 @@ USE_AUTOTOOLS= automake:19 aclocal:19 autoconf:262 PLIST_FILES= bin/ncrypt bin/nrm -.include <bsd.port.pre.mk> - post-configure: @${REINPLACE_CMD} -E 's,^(CC|CFLAGS) =,\1 \?=,g' \ ${WRKSRC}/Makefile -.if (${OSVERSION} < 501000) - @${REINPLACE_CMD} -e 's,ifndef WIN32,if (!defined(__FreeBSD__)),g' \ - ${WRKSRC}/ncrypt.c -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/nss/Makefile b/security/nss/Makefile index 87da42a716b4..54fb86dd4599 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -36,10 +36,6 @@ DIST= ${WRKSRC:H:H}/dist .include <bsd.port.pre.mk> -.if ${ARCH} == "alpha" && ${OSVERSION} < 500035 -IGNORE= core dumps on alpha during build -.endif - EXTERNALS= CVS dbm security/nss/cmd/zlib nsprpub security/dbm EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ ${EXTERNALS:C,^,--exclude ${DISTNAME}/mozilla/,} diff --git a/security/openbsm/Makefile b/security/openbsm/Makefile index ba243665ad06..286a3f399a92 100644 --- a/security/openbsm/Makefile +++ b/security/openbsm/Makefile @@ -42,16 +42,8 @@ MAN5= audit.log.5 \ audit_event.5 \ audit_user.5 \ audit_warn.5 -MAN8= auditfilterd.8 - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 600000 -MAN8+= audit.8 \ +MAN8= auditfilterd.8 \ + audit.8 \ auditd.8 -PLIST_FILES+= sbin/audit \ - sbin/auditd -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/openbsm/pkg-plist b/security/openbsm/pkg-plist index 5c695bdf3b43..74884033d0e7 100644 --- a/security/openbsm/pkg-plist +++ b/security/openbsm/pkg-plist @@ -13,6 +13,8 @@ lib/auditfilter_noop.so.0 lib/auditfilter_noop.so lib/auditfilter_noop.la lib/auditfilter_noop.a +sbin/audit +sbin/auditd sbin/auditfilterd sbin/auditreduce sbin/praudit diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 27a6b0a6b070..96bc0fad608b 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -879,17 +879,9 @@ OPENSSL_BASE_SOPATH= ${OPENSSL_BASE_SONAME:H} .if ( ${OSVERSION} >= 700019 ) IGNORE= Conflicts with version in the base .endif -.if ( ${OSVERSION} >= 600100 ) OPENSSL_SHLIBVER?= 4 .else -OPENSSL_SHLIBVER?= 3 -.endif -.else -.if ( ${OSVERSION} >= 600100 ) OPENSSL_SHLIBVER?= 5 -.else -OPENSSL_SHLIBVER?= 4 -.endif .endif # disable runtime SSE2 detection diff --git a/security/snort/Makefile b/security/snort/Makefile index 39aa954ecbe8..e59f13bea5e4 100644 --- a/security/snort/Makefile +++ b/security/snort/Makefile @@ -45,10 +45,6 @@ DOCS= RELEASE.NOTES doc/AUTHORS doc/BUGS doc/CREDITS \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500036 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-sf_snort_plugin_api.h -.endif - .if defined(WITH_FLEXRESP) LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config .elif defined(WITH_FLEXRESP2) diff --git a/security/snort/files/extra-patch-src-sf_snort_plugin_api.h b/security/snort/files/extra-patch-src-sf_snort_plugin_api.h deleted file mode 100644 index 1d0940f70374..000000000000 --- a/security/snort/files/extra-patch-src-sf_snort_plugin_api.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/dynamic-plugins/sf_engine/sf_snort_plugin_api.h.orig Fri Feb 3 01:49:10 2006 -+++ src/dynamic-plugins/sf_engine/sf_snort_plugin_api.h Wed Sep 6 13:53:28 2006 -@@ -36,8 +36,8 @@ - #include "stdio.h" - - #ifndef WIN32 --#include <netinet/in.h> - #include <sys/types.h> -+#include <netinet/in.h> - #else - typedef unsigned char u_int8_t; - typedef unsigned short u_int16_t; diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 37cadc71f488..2b421336cc2b 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -46,9 +46,6 @@ BROKEN= 'The WITH_UCONTEXT, WITH_FORK and WITH_PTHREAD options are mutually excl .endif .if defined(WITH_UCONTEXT) -.if ${OSVERSION} < 500112 -BROKEN= 'The ucontext model is only supported on FreeBSD 5.x and 6.x' -.endif CONFIGURE_ARGS+=--with-threads=ucontext CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" .elif defined(WITH_FORK) diff --git a/security/trans-proxy-tor/Makefile b/security/trans-proxy-tor/Makefile index 8d5aeb7f2755..0309da2fee78 100644 --- a/security/trans-proxy-tor/Makefile +++ b/security/trans-proxy-tor/Makefile @@ -66,10 +66,6 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/tor:${PORTSDIR}/security/tor IGNORE= requires PF .endif -.if (${OSVERSION} < 502106) -IGNORE= requires PF which is not available on FreeBSD versions below 5.3 -.endif - pre-install: PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: diff --git a/security/unicornscan/Makefile b/security/unicornscan/Makefile index bca38f85c124..f15e3ab92614 100644 --- a/security/unicornscan/Makefile +++ b/security/unicornscan/Makefile @@ -18,6 +18,7 @@ BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet USE_GMAKE= yes MAKE_ENV= LIBNET_CONFIG="${LIBNET_CONFIG}" +CFLAGS+= -DWITH_LONGOPTS MAN1= unicornscan.1 @@ -27,20 +28,6 @@ LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config .include <bsd.port.pre.mk> -# Check if where building on a 5.3 or older system. Older -# system require libpcap 0.8.x to be installed. - -.if ${OSVERSION} < 503000 -BUILD_DEPENDS+= ${PREFIX}/lib/libpcap.a:${PORTSDIR}/net/libpcap -.endif - -# Systems newer then 502103 include the getopt_long -# function - -.if ${OSVERSION} > 502103 -CFLAGS+= -DWITH_LONGOPTS -.endif - post-patch: .for text in pkg-message @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ diff --git a/security/vscan/Makefile b/security/vscan/Makefile index ee4b3afbb37a..c8cd7c4223e5 100644 --- a/security/vscan/Makefile +++ b/security/vscan/Makefile @@ -33,9 +33,6 @@ USE_LDCONFIG= YES .endif .if defined(WITHOUT_COMPAT3) -.if ${OSVERSION} < 501000 -IGNORE= requires FreeBSD 5.1 or later -.endif .else LIB_DEPENDS+= c.3:${PORTSDIR}/misc/compat3x .endif @@ -86,7 +83,7 @@ do-install: post-install: ${LN} -sf ${PREFIX}/lib${UVSCAN_LIB32}/libbsdfv.so.4 ${PREFIX}/lib${UVSCAN_LIB32}/libbsdfv.so -.if defined(WITHOUT_COMPAT3) && ${OSVERSION} >= 501000 +.if defined(WITHOUT_COMPAT3) @${ECHO_CMD} "" @${ECHO_CMD} "This may affect the system security. Use at your own risk." @${ECHO_CMD} "You need to add the following two lines to your libmap${UVSCAN_LIB32}.conf(5):" diff --git a/security/vxquery/Makefile b/security/vxquery/Makefile index 3d9a3c6fd99e..e632f076d688 100644 --- a/security/vxquery/Makefile +++ b/security/vxquery/Makefile @@ -16,14 +16,7 @@ COMMENT= VuXML Query Tool USE_BZIP2= YES GNU_CONFIGURE= YES -# FreeBSD 5.x systems have expat in the base system. -.include <bsd.port.pre.mk> -.if ${OSVERSION} < 501111 -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" -LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/object/vxquery ${PREFIX}/bin/vxquery -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/wipe/Makefile b/security/wipe/Makefile index e4d70c83621a..52961e56ca59 100644 --- a/security/wipe/Makefile +++ b/security/wipe/Makefile @@ -20,11 +20,7 @@ GNU_CONFIGURE= yes MAN1= wipe.1 PORTDOCS= CHANGES INSTALL LICENSE README TESTING TODO copyright -.include <bsd.port.pre.mk> - -.if ${OSVERSION} > 500039 EXTRA_PATCHES= ${PATCHDIR}/500040-patch-blkdev.c -.endif post-install: ${INSTALL_MAN} ${WRKSRC}/wipe.1 ${PREFIX}/man/man1 @@ -35,4 +31,4 @@ post-install: done .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/shells/v7sh/Makefile b/shells/v7sh/Makefile index fb509a8ccd45..209ac769f491 100644 --- a/shells/v7sh/Makefile +++ b/shells/v7sh/Makefile @@ -52,9 +52,6 @@ post-extract: @${CP} ${FILESDIR}/Makefile ${WRKSRC} @${CP} ${FILESDIR}/test.c ${WRKSRC} # sysIII @${CP} ${FILESDIR}/pathnames.h ${WRKSRC} # 43reno -.if ${OSVERSION} < 500005 - @${CP} ${FILESDIR}/ulimit.[ch] ${WRKSRC} # fbsd52 -.endif post-install: @${ECHO_MSG} "updating /etc/shells" diff --git a/shells/v7sh/files/Makefile b/shells/v7sh/files/Makefile index 845674f69a02..2c8426a75149 100644 --- a/shells/v7sh/files/Makefile +++ b/shells/v7sh/files/Makefile @@ -8,9 +8,6 @@ PROG= v7sh SRCS= args.c blok.c builtin.c cmd.c ctype.c error.c expand.c \ fault.c io.c macro.c main.c msg.c name.c print.c service.c \ setbrk.c stak.c string.c test.c word.c xec.c -.if ${OSVERSION} < 500005 -SRCS+= ulimit.c -.endif #CFLAGS+= -DSYSIII #CFLAGS+= -DRENO diff --git a/shells/v7sh/files/ulimit.c b/shells/v7sh/files/ulimit.c deleted file mode 100644 index 97b686c0bf04..000000000000 --- a/shells/v7sh/files/ulimit.c +++ /dev/null @@ -1,68 +0,0 @@ -/*- - * Copyright (c) 2002 Kyle Martin <mkm@ieee.org> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from FreeBSD: /repoman/r/ncvs/src/lib/libc/gen/ulimit.c,v 1.1.2.1 2003/01/08 01:23:00 tjr Exp $ - */ - -#include <sys/types.h> -#include <sys/time.h> -#include <sys/resource.h> - -#include <errno.h> -#include <limits.h> -#include <stdarg.h> -#include "ulimit.h" - -long -ulimit(int cmd, ...) -{ - struct rlimit limit; - va_list ap; - long arg; - - if (cmd == UL_GETFSIZE) { - if (getrlimit(RLIMIT_FSIZE, &limit) == -1) - return (-1); - limit.rlim_cur /= 512; - if (limit.rlim_cur > LONG_MAX) - return (LONG_MAX); - return ((long)limit.rlim_cur); - } else if (cmd == UL_SETFSIZE) { - va_start(ap, cmd); - arg = va_arg(ap, long); - va_end(ap); - limit.rlim_max = limit.rlim_cur = (rlim_t)arg * 512; - - /* The setrlimit() function sets errno to EPERM if needed. */ - if (setrlimit(RLIMIT_FSIZE, &limit) == -1) - return (-1); - if (arg * 512 > LONG_MAX) - return (LONG_MAX); - return (arg); - } else { - errno = EINVAL; - return (-1); - } -} diff --git a/shells/v7sh/files/ulimit.h b/shells/v7sh/files/ulimit.h deleted file mode 100644 index c72cd0e2dca2..000000000000 --- a/shells/v7sh/files/ulimit.h +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * Copyright (c) 2002 Kyle Martin <mkm@ieee.org> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from FreeBSD: /repoman/r/ncvs/src/include/ulimit.h,v 1.1.2.1 2003/01/08 01:23:00 tjr Exp $ - */ - -#ifndef _ULIMIT_H_ -#define _ULIMIT_H_ - -#include <sys/cdefs.h> - -#define UL_GETFSIZE 1 -#define UL_SETFSIZE 2 - -__BEGIN_DECLS -long ulimit(int, ...); -__END_DECLS - -#endif /* !_ULIMIT_H_ */ diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index b351cb7907a6..1a534853c893 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -30,6 +30,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ CONFIGURE_ARGS= --with-term-lib="ncursesw ncurses" --with-tcsetpgrp \ --enable-function-subdirs +EXTRA_PATCHES= ${FILESDIR}/extra-patch-bsdtar + OPTIONS= ZSH_MEM "Enable zsh-mem and zsh-secure-free options" on \ ZSH_MAILDIR "Enable support for Maildirs in MAIL(PATH)" on \ ZSH_MULTIBYTE "Enable multibyte character support" on \ @@ -82,9 +84,6 @@ CONFIGURE_ARGS+= --enable-multibyte CONFIGURE_ARGS+= --disable-multibyte .endif -.if ${OSVERSION} >= 503000 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-bsdtar -.endif post-patch: @${SED} -i "" -e "s,link=dynamic,link=either," \ diff --git a/sysutils/3dm/Makefile b/sysutils/3dm/Makefile index 0fa7f247eeed..dbf2c54cc4d7 100644 --- a/sysutils/3dm/Makefile +++ b/sysutils/3dm/Makefile @@ -21,10 +21,6 @@ USE_RC_SUBR= 3dm2.sh .include <bsd.port.pre.mk> -.if ${OSVERSION} < 504000 -IGNORE= is not supported in versions earlier than 5.4-RELEASE -.endif - ONLY_FOR_ARCHS= i386 amd64 NO_BUILD= yes WRKSRC= ${WRKDIR} diff --git a/sysutils/aaccli/Makefile b/sysutils/aaccli/Makefile index 0518046353e4..ee89d82e088a 100644 --- a/sysutils/aaccli/Makefile +++ b/sysutils/aaccli/Makefile @@ -26,13 +26,7 @@ MD5_FILE= ${MASTERDIR}/distinfo.i386 NO_BUILD= yes NO_WRKSUBDIR= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 600000 -IGNORE_POST_INSTALL= I -.endif - do-install: - ${PKG_ADD} -R${IGNORE_POST_INSTALL} ${WRKSRC}/${PKGNAME}_${PORTREVISION}.tgz + ${PKG_ADD} -RI ${WRKSRC}/${PKGNAME}_${PORTREVISION}.tgz -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/arcconf/Makefile b/sysutils/arcconf/Makefile index 9f22ce1b5ce4..c32b6e244951 100644 --- a/sysutils/arcconf/Makefile +++ b/sysutils/arcconf/Makefile @@ -26,21 +26,11 @@ PLIST_FILES= sbin/arcconf LIB_DEPENDS+= c.6:${PORTSDIR}/misc/compat6x .endif -.if ${OSVERSION} >= 600000 .if ${ARCH} == amd64 DIST_EXT= 6_x64 .else DIST_EXT= 6_x86 .endif -.endif - -.if ${OSVERSION} < 600000 -.if ${ARCH} == "i386" -DIST_EXT= 5_x86 -.else -IGNORE= combination OS/ARCH not supported -.endif -.endif NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/sysutils/arcconf/distinfo b/sysutils/arcconf/distinfo index 1f07d0b7c745..4582861b8aee 100644 --- a/sysutils/arcconf/distinfo +++ b/sysutils/arcconf/distinfo @@ -4,6 +4,3 @@ SIZE (cli_freebsd6_x64_v5_30_17509.tar.gz) = 726757 MD5 (cli_freebsd6_x86_v5_30_17509.tar.gz) = dcf16294f5c96c5769df5629d4bee5a0 SHA256 (cli_freebsd6_x86_v5_30_17509.tar.gz) = f82d1f180e82b72c3c38857be393580d71257a3189fecc28bdffb7f12194b612 SIZE (cli_freebsd6_x86_v5_30_17509.tar.gz) = 682641 -MD5 (cli_freebsd5_x86_v5_30_17509.tar.gz) = 5be1c4ab1742459637d9bfa3f5d7ac61 -SHA256 (cli_freebsd5_x86_v5_30_17509.tar.gz) = 19320b1b4a22c52a5f8ef2f3ced367bc80e11978f8ae457b69b89ce4a7c4be5f -SIZE (cli_freebsd5_x86_v5_30_17509.tar.gz) = 682674 diff --git a/sysutils/archivemount/Makefile b/sysutils/archivemount/Makefile index e1b398bee441..d6b76d133fd6 100644 --- a/sysutils/archivemount/Makefile +++ b/sysutils/archivemount/Makefile @@ -26,10 +26,4 @@ USE_GCC= 4.2+ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/archivemount ${PREFIX}/bin -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 # Inherited from fusefs-kmod -IGNORE= requires FreeBSD 6.x or above -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/ataidle/Makefile b/sysutils/ataidle/Makefile index 7ba816942c73..d0517e1fe79e 100644 --- a/sysutils/ataidle/Makefile +++ b/sysutils/ataidle/Makefile @@ -29,10 +29,4 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600034 -IGNORE= requires FreeBSD 6.1 or newer -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/avfs/Makefile b/sysutils/avfs/Makefile index d346a9bbc010..a17e470ec7f1 100644 --- a/sysutils/avfs/Makefile +++ b/sysutils/avfs/Makefile @@ -55,8 +55,4 @@ CONFIGURE_ARGS+= --disable-fuse PLIST_SUB+= FUSE="@comment " .endif -.if ${OSVERSION} < 600000 # Inherited from fusefs-kmod -IGNORE= requires FreeBSD 6.x or above -.endif - .include <bsd.port.post.mk> diff --git a/sysutils/bacula-server-devel/Makefile b/sysutils/bacula-server-devel/Makefile index bc1b27733128..70e55d371e13 100644 --- a/sysutils/bacula-server-devel/Makefile +++ b/sysutils/bacula-server-devel/Makefile @@ -170,13 +170,6 @@ MAKE_ENV+= MAN8="${MAN8}" MAN1="${MAN1}" pre-everything:: .if !defined(WITH_CLIENT_ONLY) -.if ${OSVERSION} < 502101 - @${ECHO_MSG} "=======> ATTENTION <=======" - @${ECHO_MSG} "===> Note that there is a pthreads problem, which leads to the loss of 500kB" - @${ECHO_MSG} "===> of data at the end of an tape. This is corrected in newer versions of FreeBSD" - @${ECHO_MSG} "===> READ ${WRKSRC}/platforms/freebsd/pthreads-fix.txt" - @${ECHO_MSG} "" -.endif @${ECHO_MSG} "You may use the following build options (or make config):" @${ECHO_MSG} "" @${ECHO_MSG} " WITH_CLIENT_ONLY=yes if you only want the file daemon." diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile index 26ab85db6363..815178aa2f82 100644 --- a/sysutils/bacula-server/Makefile +++ b/sysutils/bacula-server/Makefile @@ -191,13 +191,6 @@ MAKE_ENV+= MAN8="${MAN8}" MAN1="${MAN1}" pre-everything:: .if !defined(WITH_CLIENT_ONLY) -.if ${OSVERSION} < 502101 - @${ECHO_MSG} "=======> ATTENTION <=======" - @${ECHO_MSG} "===> Note that there is a pthreads problem, which leads to the loss of 500kB" - @${ECHO_MSG} "===> of data at the end of an tape. This is corrected in newer versions of FreeBSD" - @${ECHO_MSG} "===> READ ${WRKSRC}/platforms/freebsd/pthreads-fix.txt" - @${ECHO_MSG} "" -.endif @${ECHO_MSG} "You may use the following build options (or make config):" @${ECHO_MSG} "" @${ECHO_MSG} " WITH_CLIENT_ONLY=yes if you only want the file daemon." diff --git a/sysutils/battmond/Makefile b/sysutils/battmond/Makefile index f0d7e4a872b2..e61d583895ff 100644 --- a/sysutils/battmond/Makefile +++ b/sysutils/battmond/Makefile @@ -19,10 +19,4 @@ MANCOMPRESSED= yes PLIST_FILES= sbin/battmond \ etc/rc.d/battmond -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= requires ACPI features present in FreeBSD 6.X and newer -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/binup/Makefile b/sysutils/binup/Makefile index 6c80732e5acf..05951b172ed7 100644 --- a/sysutils/binup/Makefile +++ b/sysutils/binup/Makefile @@ -24,7 +24,7 @@ PLIST_DIRS= libexec/binup .include <bsd.port.pre.mk> -.if ${OSVERSION} < 502010 || ${OSVERSION} >= 700000 +.if ${OSVERSION} >= 700000 IGNORE= does not support ${OPSYS}-${OSREL} at this time .endif diff --git a/sysutils/bsdstats/Makefile b/sysutils/bsdstats/Makefile index d989b5a6cbea..9a11bc289077 100644 --- a/sysutils/bsdstats/Makefile +++ b/sysutils/bsdstats/Makefile @@ -14,12 +14,6 @@ DISTFILES= MAINTAINER= scrappy@freebsd.org COMMENT= Monthly script for reporting anonymous statistics about your machine -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 503102 || (${OSVERSION} >= 600000 && ${OSVERSION} < 600010) -RUN_DEPENDS= nc:${PORTSDIR}/net/netcat -.endif - NO_BUILD= yes do-install: @@ -39,4 +33,4 @@ post-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index 093060ee033b..6a5f4a37a452 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -51,10 +51,6 @@ CCOM!= ${BASENAME} ${CC} MAKE_ENV= CCOM=${CCOM} LANG=C CDRTLSTARGET= ${ARCH}-freebsd-${CCOM} -.if ${OSVERSION} >= 501104 && ${OSVERSION} < 502113 -IGNORE= The mlockall(2) of your FreeBSD 5.x version causes problems when used by cdrecord. Please update FreeBSD to >= 5.3 in order to use this port -.endif - pre-everything:: .if !defined(WITH_RSCSI) @${ECHO_MSG} "" diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile index a51bb6b30021..2055915f2bef 100644 --- a/sysutils/condor/Makefile +++ b/sysutils/condor/Makefile @@ -29,10 +29,6 @@ USE_PERL5_BUILD= yes .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -BROKEN= Does not compile -.endif - .if ${ARCH} == "amd64" && ${OSVERSION} >= 700000 BROKEN= Does not compile .endif diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile index 3ba9e0e0c413..182c6ded4ad5 100644 --- a/sysutils/daemontools/Makefile +++ b/sysutils/daemontools/Makefile @@ -41,7 +41,8 @@ PATCH_DIST_STRIP= -p2 .endif USE_RC_SUBR= yes -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} SERVICEDIR=${SERVICEDIR} +RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} SERVICEDIR=${SERVICEDIR} \ + DAEMON="/usr/sbin/daemon -f" WRKSRC= ${WRKDIR}/admin/${DISTNAME}/src @@ -53,12 +54,6 @@ SERVICEDIR?= /var/service STARTUP_SCRIPT?= ${SAMPLERC:S/.sample//} PLIST_SUB+= STARTUP_SCRIPT="${STARTUP_SCRIPT}" -.if ${OSVERSION} >= 500023 -RC_SCRIPTS_SUB+= DAEMON="/usr/sbin/daemon -f" -.else -RC_SCRIPTS_SUB+= DAEMON="" -.endif - .if defined(WITHOUT_TESTS) EXTRA_PATCHES+= ${FILESDIR}/rts-skip.patch .endif diff --git a/sysutils/desktopbsd-tools/Makefile b/sysutils/desktopbsd-tools/Makefile index 60a97a08a8b5..c1176ec94489 100644 --- a/sysutils/desktopbsd-tools/Makefile +++ b/sysutils/desktopbsd-tools/Makefile @@ -34,18 +34,10 @@ DATADIR= ${PREFIX}/share/desktopbsd .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600007 -IGNORE= requires FreeBSD 6 or newer -.endif - .if ${OSVERSION} < 601101 || ( ${OSVERSION} >= 700000 && ${OSVERSION} < 700015 ) RUN_DEPENDS+= csup:${PORTSDIR}/net/csup .endif -.if ${OSVERSION} >= 600000 && ${OSVERSION} < 600033 -RUN_DEPENDS+= portsnap:${PORTSDIR}/ports-mgmt/portsnap -.endif - post-patch: @${REINPLACE_CMD} -e \ "/Installation/d; /Documentation/d; /InitialConf/d" \ diff --git a/sysutils/djmount/Makefile b/sysutils/djmount/Makefile index 5bd801c3afd4..9c1c183e2aff 100644 --- a/sysutils/djmount/Makefile +++ b/sysutils/djmount/Makefile @@ -27,16 +27,10 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ PORTDOCS= AUTHORS ChangeLog NEWS README TODO -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= depends on kernel module that requires FreeBSD 6 or later -.endif - post-install: .ifndef NOPORTDOCS @${INSTALL} -d ${DOCSDIR}/ @cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/ezjail/Makefile b/sysutils/ezjail/Makefile index 299be3059d28..d3ce2c2022fd 100644 --- a/sysutils/ezjail/Makefile +++ b/sysutils/ezjail/Makefile @@ -18,10 +18,4 @@ USE_BZIP2= yes MAN1= ezjail-admin.1 MAN5= ezjail.5 ezjail.conf.5 -.include <bsd.port.pre.mk> - -.if ( ${OSVERSION} < 600000 ) -IGNORE= nullfs in FreeBSD releases before 6.0 is considered unstable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fdupes/Makefile b/sysutils/fdupes/Makefile index 1b7d69f89cd0..0d0b8950ba90 100644 --- a/sysutils/fdupes/Makefile +++ b/sysutils/fdupes/Makefile @@ -19,12 +19,6 @@ PLIST_FILES= bin/fdupes CFLAGS+= -DVERSION=\"${PORTVERSION}\" -.include <bsd.port.pre.mk> - -.if (${OSVERSION} < 500041) -CFLAGS+= -DOMIT_GETOPT_LONG=yes -.endif - do-build: ${CC} ${CFLAGS} ${WRKSRC}/${PORTNAME}.c ${WRKSRC}/md5/md5.c \ -o ${WRKSRC}/${PORTNAME} @@ -33,4 +27,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/flexbackup/Makefile b/sysutils/flexbackup/Makefile index c94da0f8ff22..bc48c82f511d 100644 --- a/sysutils/flexbackup/Makefile +++ b/sysutils/flexbackup/Makefile @@ -15,6 +15,11 @@ MASTER_SITES= http://www.edwinh.org/flexbackup/tarball/ \ MAINTAINER= mva@sysfault.org COMMENT= Perl-based flexible backup system that can use dump/afio/cpio/tar/star +# FreeBSD 6.0 removed gtar +RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtar + +TAR_CMD= ${PREFIX}/bin/gtar + MAKE_ARGS= PERLPATH=${PERL} CONFFILE=${PREFIX}/etc/flexbackup.conf USE_PERL5= yes @@ -29,17 +34,6 @@ OPTIONS= AFIO "Enable afio support" Off \ .include <bsd.port.pre.mk> -# Releases previous to 5.3 do not need a special gtar handling as GNU tar -# is the default here. >= 503001 to < 60022 have GNU tar renamed to gtar -# under circumstances, thus rely on gtar here. 600022 removed gtar. -TAR_CMD= /usr/bin/tar -.if ${OSVERSION} >= 600022 -RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtar -TAR_CMD= ${PREFIX}/bin/gtar -.elif ${OSVERSION} >= 503001 && ${OSVERSION} < 600022 -TAR_CMD= /usr/bin/gtar -.endif - .if defined(WITH_AFIO) RUN_DEPENDS+= afio:${PORTSDIR}/sysutils/afio .endif diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile index 496a3e4e737e..89c1342e781e 100644 --- a/sysutils/freeipmi/Makefile +++ b/sysutils/freeipmi/Makefile @@ -69,10 +69,6 @@ LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500112 -BROKEN= missing getpw*_r functions in this FreeBSD release -.endif - .if defined(WITH_IOPERM) .if ${ARCH} == "i386" CPPFLAGS+= -DUSE_IOPERM diff --git a/sysutils/freesbie/Makefile b/sysutils/freesbie/Makefile index 3eb37265cfee..3cd9fce17d00 100644 --- a/sysutils/freesbie/Makefile +++ b/sysutils/freesbie/Makefile @@ -21,15 +21,9 @@ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}2 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 504000 -IGNORE= earlier FreeBSD versions then 5.4-RELEASE are not supported -.endif - do-install: @ ${MKDIR} ${DATADIR} @ cd ${WRKSRC} && ${FIND} . -type f -print | tar -cf - -T - | \ tar -xf - -C ${DATADIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fusefs-chironfs/Makefile b/sysutils/fusefs-chironfs/Makefile index 7379d5d4c846..7027ab674f10 100644 --- a/sysutils/fusefs-chironfs/Makefile +++ b/sysutils/fusefs-chironfs/Makefile @@ -30,10 +30,4 @@ post-patch: @${REINPLACE_CMD} -e 's, doc , ,' ${WRKSRC}/Makefile.in .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 # Inherited from sysutils/fusefs-kmod -IGNORE= depends on kernel module that requires FreeBSD 6 or later -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fusefs-curlftpfs/Makefile b/sysutils/fusefs-curlftpfs/Makefile index 235e36c94466..b1e3953e7987 100644 --- a/sysutils/fusefs-curlftpfs/Makefile +++ b/sysutils/fusefs-curlftpfs/Makefile @@ -25,10 +25,4 @@ USE_GNOME= glib20 MAN1= ${PORTNAME}.1 PLIST_FILES= bin/curlftpfs -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= depends on kernel module that requires FreeBSD 6 or later -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fusefs-funionfs/Makefile b/sysutils/fusefs-funionfs/Makefile index 8eebdda6c71d..a8730094d5f9 100644 --- a/sysutils/fusefs-funionfs/Makefile +++ b/sysutils/fusefs-funionfs/Makefile @@ -24,10 +24,4 @@ GNU_CONFIGURE= yes MAN1= funionfs.1 PLIST_FILES= bin/funionfs -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 # Inherited from fusefs-kmod -IGNORE= requires FreeBSD 6.x or above -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fusefs-gunzip/Makefile b/sysutils/fusefs-gunzip/Makefile index 55c83fba4723..091f5f642b20 100644 --- a/sysutils/fusefs-gunzip/Makefile +++ b/sysutils/fusefs-gunzip/Makefile @@ -32,10 +32,4 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fuse.gunzip ${PREFIX}/bin -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 # Inherited from fusefs-kmod -IGNORE= requires FreeBSD 6.x or above -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fusefs-httpfs/Makefile b/sysutils/fusefs-httpfs/Makefile index b05e7a1bf7a9..2ef3a86eeee4 100644 --- a/sysutils/fusefs-httpfs/Makefile +++ b/sysutils/fusefs-httpfs/Makefile @@ -32,10 +32,4 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/httpfs ${PREFIX}/bin -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 # Inherited from sysutils/fusefs-kmod -IGNORE= depends on kernel module that requires FreeBSD 6 or later -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fusefs-kmod/Makefile b/sysutils/fusefs-kmod/Makefile index ea21b42314e0..5c774ca5eea1 100644 --- a/sysutils/fusefs-kmod/Makefile +++ b/sysutils/fusefs-kmod/Makefile @@ -58,10 +58,6 @@ OPTIONS= AUTOSETUP "Automatic global config file setup" off .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -IGNORE= requires FreeBSD 6 or above. Please consider porting it to 5.x or even 4.x -.endif - .if !exists(${SRC_BASE}/sys/Makefile) IGNORE= requires the Kernel source to be installed. Set SRC_BASE if it is not in /usr/src .endif diff --git a/sysutils/fusefs-libs/Makefile b/sysutils/fusefs-libs/Makefile index 6a683c26957c..579fde361dd9 100644 --- a/sysutils/fusefs-libs/Makefile +++ b/sysutils/fusefs-libs/Makefile @@ -26,12 +26,6 @@ CONFIGURE_ARGS= --disable-kernel-module --prefix=${PREFIX} \ TXT_DOCS= how-fuse-works \ kernel.txt -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= depends on kernel module that requires FreeBSD 6 or later -.endif - post-patch: ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},' \ -e 's,-D_FILE_OFFSET_BITS=64,-D_FILE_OFFSET_BITS=64 ${PTHREAD_CFLAGS},' \ @@ -50,4 +44,4 @@ post-install: .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile index 8ab4dc04f90a..ed04f2f5366f 100644 --- a/sysutils/fusefs-ntfs/Makefile +++ b/sysutils/fusefs-ntfs/Makefile @@ -36,10 +36,6 @@ MLINKS= ntfs-3g.8 mount_ntfs-3g.8 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -IGNORE= depends on kernel module that requires FreeBSD 6 or later -.endif - .if defined(WITH_LOCK) CFLAGS+= -DUSE_LOCK .endif diff --git a/sysutils/fusefs-smbnetfs/Makefile b/sysutils/fusefs-smbnetfs/Makefile index ccb04eb8974e..5c3f249f9a74 100644 --- a/sysutils/fusefs-smbnetfs/Makefile +++ b/sysutils/fusefs-smbnetfs/Makefile @@ -26,13 +26,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" SUB_FILES= pkg-message -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= depends on kernel module that requires FreeBSD 6 or later -.endif - post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fusefs-sqlfs/Makefile b/sysutils/fusefs-sqlfs/Makefile index 42b602798c1d..9fba9de57cb3 100644 --- a/sysutils/fusefs-sqlfs/Makefile +++ b/sysutils/fusefs-sqlfs/Makefile @@ -31,10 +31,6 @@ PLIST_FILES= bin/sqlfs .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -IGNORE= depends on kernel module that requires FreeBSD 6 or later -.endif - do-build: (cd ${WRKSRC} && ${CC} -DFUSE -DFUSE_USE_VERSION=25 \ -D_FILE_OFFSET_BITS=64 -D_REENTRANT ${CFLAGS} \ diff --git a/sysutils/fusefs-sshfs/Makefile b/sysutils/fusefs-sshfs/Makefile index a64c295c7d5c..c78badfad47e 100644 --- a/sysutils/fusefs-sshfs/Makefile +++ b/sysutils/fusefs-sshfs/Makefile @@ -24,13 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" USE_GNOME= glib20 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= depends on kernel module that requires FreeBSD 6 or later -.endif - post-install: @${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fusefs-unionfs/Makefile b/sysutils/fusefs-unionfs/Makefile index 13dbadbf2a1d..7171957179c1 100644 --- a/sysutils/fusefs-unionfs/Makefile +++ b/sysutils/fusefs-unionfs/Makefile @@ -31,10 +31,4 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unionfs ${PREFIX}/bin -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 # Inherited from fusefs-kmod -IGNORE= requires FreeBSD 6.x or above -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fusefs-wdfs/Makefile b/sysutils/fusefs-wdfs/Makefile index f0c6b8a5a196..597a237b446d 100644 --- a/sysutils/fusefs-wdfs/Makefile +++ b/sysutils/fusefs-wdfs/Makefile @@ -24,10 +24,4 @@ USE_GNOME= glib20 PLIST_FILES= bin/wdfs -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= depends on kernel module that requires FreeBSD 6 or later -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fusefs-wikipediafs/Makefile b/sysutils/fusefs-wikipediafs/Makefile index 3db4cd703d21..0fa6582c49bd 100644 --- a/sysutils/fusefs-wikipediafs/Makefile +++ b/sysutils/fusefs-wikipediafs/Makefile @@ -23,12 +23,6 @@ USE_PYDISTUTILS=yes PORTDOCS= AUTHORS ChangeLog HACKING NEWS README TODO MAN1= mount.${PORTNAME}.1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= depends on kernel module that requires FreeBSD 6 or later -.endif - post-extract: @${GUNZIP_CMD} ${WRKSRC}/doc/*gz @@ -43,4 +37,4 @@ post-install: @cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fuser/Makefile b/sysutils/fuser/Makefile index c6f845adda62..e086171adbbc 100644 --- a/sysutils/fuser/Makefile +++ b/sysutils/fuser/Makefile @@ -23,10 +23,6 @@ PLIST_FILES= bin/fuser .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -IGNORE= src/sys/fs/devfs/devfs_int.h does not exist before OSVERSION 600000 -.endif - .if ${OSVERSION} >= 800000 BROKEN= does not compile .endif diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile index 210cab938598..9595f37dbc1f 100644 --- a/sysutils/gkrellm2/Makefile +++ b/sysutils/gkrellm2/Makefile @@ -88,9 +88,6 @@ PORTDOCS= COPYRIGHT CREDITS README Themes.html .endif ALL_TARGET= freebsd -.if ${OSVERSION} < 500000 -INSTALL_TARGET= install_freebsd -.endif MAKE_ENV+= INSTALLROOT=${LOCALBASE} INSTALLDIR=${LOCALBASE}/bin \ PKGCONFIGDIR=${LOCALBASE}/libdata/pkgconfig \ @@ -115,12 +112,6 @@ post-install: @${MKDIR} ${LOCALBASE}/libexec/gkrellm2/plugins @${MKDIR} ${LOCALBASE}/share/gkrellm2/themes @${GZIP_CMD} ${MAN1PREFIX}/man/man1/gkrellm.1 -.if ${OSVERSION} < 500000 - @${CHMOD} 2511 ${LOCALBASE}/bin/gkrellm -.endif -.endif -.if ${OSVERSION} < 500000 - @${CHMOD} 2511 ${PREFIX}/sbin/gkrellmd .endif @${MKDIR} ${PREFIX}/libexec/gkrellm2/plugins-gkrellmd @${MKDIR} ${EXAMPLESDIR} diff --git a/sysutils/gpte/Makefile b/sysutils/gpte/Makefile index 744eb18d01ff..68d0e7ca3440 100644 --- a/sysutils/gpte/Makefile +++ b/sysutils/gpte/Makefile @@ -20,10 +20,4 @@ PLIST_FILES= bin/gpte post-extract: cd $(WRKSRC) && ${CP} Makefile.bsd Makefile -.include <bsd.port.pre.mk> - -.if $(OSVERSION) < 502000 -IGNORE= Only for 5.x and later systems -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index f97c49754578..bccb417b1c3d 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -71,10 +71,6 @@ OPTIONS= FIXED_MOUNTPOINTS "use fixed mountpoints" off .include <bsd.port.pre.mk> -.if ${OSVERSION} < 505000 -IGNORE= not supported on FreeBSD prior to 5.5-RELEASE -.endif - .if (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64") RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode .endif diff --git a/sysutils/hdup/Makefile b/sysutils/hdup/Makefile index 4fc3261a8a95..34b2df106ea8 100644 --- a/sysutils/hdup/Makefile +++ b/sysutils/hdup/Makefile @@ -39,8 +39,6 @@ MAN5= hdup.conf.5 BUILD_DEPENDS+= ${LOCALBASE}/gtar:${PORTSDIR}/archivers/gtar RUN_DEPENDS+= ${LOCALBASE}/gtar:${PORTSDIR}/archivers/gtar GNUTAR= ${LOCALBASE}/bin/gtar -.elif ${OSVERSION} < 502110 -GNUTAR= /usr/bin/tar .else # bsdtar appeared GNUTAR= /usr/bin/gtar diff --git a/sysutils/hourglass/Makefile b/sysutils/hourglass/Makefile index 1d2dc09340dd..aedb9557e5ee 100644 --- a/sysutils/hourglass/Makefile +++ b/sysutils/hourglass/Makefile @@ -25,15 +25,9 @@ PORTDOCS= CALIBRATION .include <bsd.port.pre.mk> .if defined(WITH_LINUXTHREADS) - -.if ${OSVERSION} >= 500035 PTHREAD_LIBS= -L${LOCALBASE}/lib -llthread -llgcc_r PTHREAD_CFLAGS= -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads -.else -LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads -.endif - .endif post-patch: diff --git a/sysutils/ipmi-kmod/Makefile b/sysutils/ipmi-kmod/Makefile index 899f2baa0eb2..8d0fe70e848f 100644 --- a/sysutils/ipmi-kmod/Makefile +++ b/sysutils/ipmi-kmod/Makefile @@ -35,13 +35,6 @@ IGNORE= requires kernel source to be installed .if exists(${SRC_BASE}/sys/dev/ipmi) IGNORE= is already included in the base system -.elif ${OSVERSION} < 503000 -IGNORE= does not support FreeBSD before 5.3 -.endif - -# Need to include this extra path on 5.x. -.if ${OSVERSION} < 600000 -CFLAGS+= -I@/contrib/dev/acpica .endif do-install: diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index 42136015bea0..404f7154386f 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -79,32 +79,10 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${PREFIX}/share/lsof @${CHMOD} 0444 ${PREFIX}/share/lsof/00* -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500019 -.if !exists(${FREEBSD_SYS}/miscfs/fdesc/fdesc.h) -.if defined(PACKAGE_BUILDING) -BROKEN= 'please install kernel source for official package builds' -.endif - -pre-configure: - @${ECHO} "" - @${ECHO} "************************************************************" - @${ECHO} "* W a r n i n g *" - @${ECHO} "* A more capable version of LSOF is built if you have *" - @${ECHO} "* the complete kernel source installed. *" - @${ECHO} "* If your kernel sources are somewhere other than *" - @${ECHO} "* /usr/src/sys, you may set the FREEBSD_SYS variable *" - @${ECHO} "* to the correct path. *" - @${ECHO} "************************************************************" - @${ECHO} "" -.endif -.endif - post-install: cd ${PREFIX} && \ ${FIND} -s share/lsof -type f -o -type l >>${TMPPLIST} ;\ ${FIND} -d share/lsof -type d \ | ${SED} -e 's/^/@dirrm /g' >>${TMPPLIST} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/ltrace/Makefile b/sysutils/ltrace/Makefile index 30361ddfc7bc..facd87d59f93 100644 --- a/sysutils/ltrace/Makefile +++ b/sysutils/ltrace/Makefile @@ -28,12 +28,6 @@ CONFLICTS= polygraph-2* MAN1= ltrace.1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 502000 -IGNORE= depends on PT_SYSCALL ptrace option -.endif - post-patch: ${REINPLACE_CMD} -e 's|^\(CC\)|#\1|' ${WRKSRC}/Makefile.in @@ -42,4 +36,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/etc/ltrace.conf ${PREFIX}/etc ${INSTALL_MAN} ${WRKSRC}/ltrace.1 ${PREFIX}/man/man1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/mono-kmod/Makefile b/sysutils/mono-kmod/Makefile index 1be599837501..1849d94b38ff 100644 --- a/sysutils/mono-kmod/Makefile +++ b/sysutils/mono-kmod/Makefile @@ -31,10 +31,6 @@ PLIST_FILES+= "@unexec kldxref ${KMODDIR}" .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600009 -IGNORE= requires FreeBSD 6.0 or higher -.endif - .if !exists(${SRC_BASE}/sys/Makefile) IGNORE= requires kernel source to be installed .endif diff --git a/sysutils/p5-BSD-Jail-Object/Makefile b/sysutils/p5-BSD-Jail-Object/Makefile index 4cdd56478cfa..53e53024ee4f 100644 --- a/sysutils/p5-BSD-Jail-Object/Makefile +++ b/sysutils/p5-BSD-Jail-Object/Makefile @@ -21,10 +21,4 @@ PERL_CONFIGURE= 5.8.6+ MAN3= BSD::Jail::Object.3 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 503100 # ref: jail.h v1.17 -IGNORE= require xprison structure defined -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/p5-Fuse-Simple/Makefile b/sysutils/p5-Fuse-Simple/Makefile index 82e045ab3655..e2f8969a05fe 100644 --- a/sysutils/p5-Fuse-Simple/Makefile +++ b/sysutils/p5-Fuse-Simple/Makefile @@ -23,10 +23,6 @@ MAN3= Fuse::Simple.3 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 # Inherited from sysutils/p5-Fuse -IGNORE= depends on kernel module that requires FreeBSD 6 or later -.endif - .if ${PERL_LEVEL} < 500703 RUN_DEPENDS+= ${SITE_PERL}/Switch.pm:${PORTSDIR}/lang/p5-Switch .endif diff --git a/sysutils/p5-Fuse/Makefile b/sysutils/p5-Fuse/Makefile index fd7c720db727..513f7bee0d20 100644 --- a/sysutils/p5-Fuse/Makefile +++ b/sysutils/p5-Fuse/Makefile @@ -24,10 +24,4 @@ USE_GNOME= pkgconfig MAN3= Fuse.3 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 # Inherited from sysutils/fusefs-libs -IGNORE= depends on kernel module that requires FreeBSD 6 or later -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/pecl-fileinfo/Makefile b/sysutils/pecl-fileinfo/Makefile index c382a3087c72..17003b4e657e 100644 --- a/sysutils/pecl-fileinfo/Makefile +++ b/sysutils/pecl-fileinfo/Makefile @@ -20,15 +20,6 @@ COMMENT= A PECL extension to retrieve info about files USE_PHP= yes USE_PHPEXT= yes -.include <bsd.port.pre.mk> +CONFIGURE_ARGS= --with-fileinfo=/usr -.if ${OSVERSION} < 502128 -LIB_DEPENDS+= magic.1:${PORTSDIR}/sysutils/file -MAGICBASE= ${LOCALBASE} -.else -MAGICBASE= /usr -.endif - -CONFIGURE_ARGS= --with-fileinfo=${MAGICBASE} - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/pflogx/Makefile b/sysutils/pflogx/Makefile index 9a028f930c38..f062034c1c6a 100644 --- a/sysutils/pflogx/Makefile +++ b/sysutils/pflogx/Makefile @@ -21,10 +21,6 @@ OPTIONS= EXPAT "Ability to merge new events (require expat) " Off .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -IGNORE= only for 6.0 and above -.endif - .if defined(WITH_EXPAT) LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 MAKE_ARGS+= -DWITH_EXPAT \ diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile index 102155ad67ff..822a647cf387 100644 --- a/sysutils/pfstat/Makefile +++ b/sysutils/pfstat/Makefile @@ -30,10 +30,6 @@ PLIST_FILES= bin/pfstat \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 502106 -IGNORE= is only for 5.3 and above -.endif - .if ${OSVERSION} < 700048 EXTRA_PATCHES= ${PATCHDIR}/pre41-patch-pf.c .endif diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile index dc367f6f423e..39da666091f2 100644 --- a/sysutils/pftop/Makefile +++ b/sysutils/pftop/Makefile @@ -21,19 +21,7 @@ MANCOMPRESSED= no .include <bsd.port.pre.mk> -.if ${OSVERSION} < 502106 -IGNORE= only for 5.3 and above -.endif - -.if ${OSVERSION} < 502116 -MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=34 -.if defined(WITH_ALTQ) && (${WITH_ALTQ} == "yes") -CFLAGS+= -DHAVE_ALTQ=1 -.endif -.elif ${OSVERSION} < 600025 -MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=35 -CFLAGS+= -DHAVE_ALTQ=1 -DHAVE_RULE_ANCHOR=1 -.elif ${OSVERSION} < 700049 +.if ${OSVERSION} < 700049 MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=37 CFLAGS+= -DHAVE_ALTQ=1 .else diff --git a/sysutils/pmap/Makefile b/sysutils/pmap/Makefile index ccd3a5977a03..70ea7df72e0b 100644 --- a/sysutils/pmap/Makefile +++ b/sysutils/pmap/Makefile @@ -33,10 +33,6 @@ MANCOMPRESSED= maybe BROKEN= Currently does not support -CURRENT .endif -.if ${OSVERSION} < 600000 -IGNORE= not supported on systems prior to 6.0 -.endif - pre-fetch: .if !exists(${SRC_BASE}/sys/Makefile) IGNORE= requires kernel sources diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile index 861af8d85548..149c13c8e21a 100644 --- a/sysutils/progsreiserfs/Makefile +++ b/sysutils/progsreiserfs/Makefile @@ -18,6 +18,9 @@ COMMENT= Utilities and library to manipulate ReiserFS partitions USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-debug --disable-Werror +CFLAGS+= -Dgetopt_long_only=getopt_long + +EXTRA_PATCHES= ${FILESDIR}/extrapatch-progsreiserfs::libmisc::Makefile.in .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls @@ -29,17 +32,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" MAN8= cpfs.reiserfs.8 mkfs.reiserfs.8 reiserfs.8 \ resizefs.reiserfs.8 tunefs.reiserfs.8 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500041 -CFLAGS+= -Dgetopt_long_only=getopt_long -EXTRA_PATCHES= ${FILESDIR}/extrapatch-progsreiserfs::libmisc::Makefile.in -.endif - post-patch: @${REINPLACE_CMD} -e 's|^LIBTOOL=.*|LIBTOOL=${LIBTOOL}|g' \ ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|sys/int_types.h|inttypes.h|' \ ${WRKSRC}/libreiserfs/tools.c ${WRKSRC}/include/reiserfs/* -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/psgconf/Makefile b/sysutils/psgconf/Makefile index cc4310cf8796..f0855ffd5d04 100644 --- a/sysutils/psgconf/Makefile +++ b/sysutils/psgconf/Makefile @@ -194,13 +194,6 @@ PKGDEINSTALL= ${WRKSRC}/postinstall post-patch: ${FIND} ${WRKSRC} -name "*.orig" -delete -#.if ${OSVERSION} > 599999 -# Does not work because Proc::ProcessTable is broken in 5.x -#${BUILD_DEPENDS}+= ${SITE_PERL}/Perl/Tidy.pm:${PORTSDIR}/devel/perltidy -#post-build: -# cd ${WRKSRC} && ${MAKE} test -#.endif - post-install: -@${MKDIR} ${PREFIX}/etc @${CP} ${WRKSRC}/etc/psg.conf ${PREFIX}/etc/psg.conf.sample diff --git a/sysutils/pstack/Makefile b/sysutils/pstack/Makefile index b2302ba8023b..574cacf09f53 100644 --- a/sysutils/pstack/Makefile +++ b/sysutils/pstack/Makefile @@ -22,11 +22,7 @@ MANCOMPRESSED= yes MAN1= pstack.1 PLIST_FILES= bin/pstack -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 600000 post-patch: ${REINPLACE_CMD} -e 's/DT_COUNT/DT_BIND_NOW/' ${WRKSRC}/elf.c -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/rfstool/Makefile b/sysutils/rfstool/Makefile index 303f9ab55603..874348a6cdfd 100644 --- a/sysutils/rfstool/Makefile +++ b/sysutils/rfstool/Makefile @@ -17,13 +17,7 @@ COMMENT= Read from a Reiser file system PLIST_FILES= bin/rfstool USE_ZIP= yes WRKSRC= ${WRKDIR}/rfstool-0.14/RFSTOOL - -.include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500035 MAKEFILE= makefile.gcc3x -.else -MAKEFILE= makefile.gcc2x -.endif post-extract: @${REINPLACE_CMD} -e "s,g++,\$${CXX},g" ${WRKSRC}/${MAKEFILE} @@ -31,4 +25,4 @@ post-extract: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rfstool ${PREFIX}/bin -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/sfdisk/Makefile b/sysutils/sfdisk/Makefile index 2296c9c57812..398ca4154aac 100644 --- a/sysutils/sfdisk/Makefile +++ b/sysutils/sfdisk/Makefile @@ -26,8 +26,4 @@ NOT_FOR_ARCHS= ia64 CFLAGS+= -DPC98 .endif -.if ${OSVERSION} < 502000 -IGNORE= is only for FreeBSD 5.X and later -.endif - .include <bsd.port.post.mk> diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile index c77671ba1592..5ec4dd504f75 100644 --- a/sysutils/sge60/Makefile +++ b/sysutils/sge60/Makefile @@ -93,10 +93,6 @@ EXCEPTFILES= arc_depend_irix.asc arc_depend_solaris.asc man testsuite .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -BROKEN= missing pthread type defs in sys/types.h -.endif - .if defined(WITH_BDB) LIB_DEPENDS= db-4.2:${PORTSDIR}/databases/db42 PLIST_SUB+= BDB_SPOOL= diff --git a/sysutils/vobcopy/Makefile b/sysutils/vobcopy/Makefile index 9c7aff462f28..f93bf57e663a 100644 --- a/sysutils/vobcopy/Makefile +++ b/sysutils/vobcopy/Makefile @@ -42,11 +42,9 @@ post-patch: ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # -CURRENT after 500041 has getopt_long # do not use libgnugetopt -.if ${OSVERSION} >= 500041 @${REINPLACE_CMD} -E \ -e 's|-lgnugetopt||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -.endif # fix typo @${REINPLACE_CMD} -E \ -e 's|FreeBSD_Version|FreeBSD_version|' \ diff --git a/sysutils/watchdog/Makefile b/sysutils/watchdog/Makefile index 1becae413f15..bd753519d4e0 100644 --- a/sysutils/watchdog/Makefile +++ b/sysutils/watchdog/Makefile @@ -18,13 +18,4 @@ MAN8= watchdogd.8 MANCOMPRESSED= yes PLIST_FILES= bin/watchdogd -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500043 -# We need revision 1.12 of /sys/i386/i386/elan-mmrc.c and -# 1.1 of /sys/sys/watchdog.h. The first tag is RELENG_5_1. -# -IGNORE= cannot install: this port only works on FreeBSD 5.1 and above -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile index 4831ff4f8a20..f23cec84f38a 100644 --- a/sysutils/whowatch/Makefile +++ b/sysutils/whowatch/Makefile @@ -16,17 +16,13 @@ MASTER_SITE_SUBDIR= UNIX/IDS MAINTAINER= ports@FreeBSD.org COMMENT= Displays information in real time about users currently logged on -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500014 -pre-patch: - @${FIND} ${WRKSRC} -name 'proc????.c' | ${XARGS} ${REINPLACE_CMD} -E \ - -e 's/kp_.?proc\.._/ki_/ ; s/pcred\.p_//' -.endif - GNU_CONFIGURE= yes MAN1= whowatch.1 PLIST_FILES= bin/whowatch -.include <bsd.port.post.mk> +pre-patch: + @${FIND} ${WRKSRC} -name 'proc????.c' | ${XARGS} ${REINPLACE_CMD} -E \ + -e 's/kp_.?proc\.._/ki_/ ; s/pcred\.p_//' + +.include <bsd.port.mk> diff --git a/sysutils/xsi/Makefile b/sysutils/xsi/Makefile index c5948cf24296..9f99e5306637 100644 --- a/sysutils/xsi/Makefile +++ b/sysutils/xsi/Makefile @@ -35,10 +35,4 @@ post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif -.include <bsd.port.pre.mk> - -.if (${OSVERSION} < 600007) -IGNORE= is not supported on FreeBSD < 6.0 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/yawho/Makefile b/sysutils/yawho/Makefile index cfe66884c918..2eeb9f617f1d 100644 --- a/sysutils/yawho/Makefile +++ b/sysutils/yawho/Makefile @@ -13,15 +13,11 @@ MASTER_SITES= http://wizard.ae.krakow.pl/~mike/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Simple 'w'-like program; displays connection type and login shell PID -PLIST_FILES= bin/yawho +GNU_CONFIGURE= yes -.include <bsd.port.pre.mk> +PLIST_FILES= bin/yawho -.if ${OSVERSION} >= 500014 pre-patch: @${REINPLACE_CMD} -E -e 's/kp_.?proc\.._/ki_/' ${WRKSRC}/process.c -.endif - -GNU_CONFIGURE= yes -.include <bsd.port.post.mk> +.include <bsd.port.mk> |