diff options
author | Edwin Groothuis <edwin@FreeBSD.org> | 2007-10-04 02:24:29 +0000 |
---|---|---|
committer | Edwin Groothuis <edwin@FreeBSD.org> | 2007-10-04 02:24:29 +0000 |
commit | 52d564a55281a0e508af246fff0da98dc47c91f7 (patch) | |
tree | 3f8a80ef119467b0186ce4ffff223c0d0120ca4e /net-mgmt | |
parent | 2f5fd33d0b48f766e2722a601367b2d51c9e82a8 (diff) |
Remove always-false/true conditions based on OSVERSION 500000
Notes
Notes:
svn path=/head/; revision=200778
Diffstat (limited to 'net-mgmt')
-rw-r--r-- | net-mgmt/arpscan/Makefile | 8 | ||||
-rw-r--r-- | net-mgmt/flowd/Makefile | 8 | ||||
-rw-r--r-- | net-mgmt/irrtoolset/Makefile | 10 | ||||
-rw-r--r-- | net-mgmt/netmond/Makefile | 8 | ||||
-rw-r--r-- | net-mgmt/nsca/Makefile | 6 | ||||
-rw-r--r-- | net-mgmt/pftabled/Makefile | 8 | ||||
-rw-r--r-- | net-mgmt/trafd/Makefile | 10 | ||||
-rw-r--r-- | net-mgmt/weplab/Makefile | 8 |
8 files changed, 9 insertions, 57 deletions
diff --git a/net-mgmt/arpscan/Makefile b/net-mgmt/arpscan/Makefile index b736629b606a..7fc72bd401a8 100644 --- a/net-mgmt/arpscan/Makefile +++ b/net-mgmt/arpscan/Makefile @@ -22,10 +22,4 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ PLIST_FILES= bin/arpscan -.include <bsd.port.pre.mk> - -.if ${OSVERSION} <= 500000 -IGNORE= unknown BIOCSETIF error -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/flowd/Makefile b/net-mgmt/flowd/Makefile index a636d9880773..fc43d48a0c57 100644 --- a/net-mgmt/flowd/Makefile +++ b/net-mgmt/flowd/Makefile @@ -37,12 +37,6 @@ PLIST_SUB+= WITH_PYTHON="" PLIST_SUB+= WITH_PYTHON="@comment " .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -CONFIGURE_ARGS+="ac_cv_sizeof_sa_family_t=1" -.endif - pre-extract: @${ECHO_MSG} "" .if defined(WITH_PERL) @@ -82,4 +76,4 @@ post-install: FLOWD_USER=${FLOWD_USER} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/irrtoolset/Makefile b/net-mgmt/irrtoolset/Makefile index e190c3d7faab..9eb991b9999d 100644 --- a/net-mgmt/irrtoolset/Makefile +++ b/net-mgmt/irrtoolset/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include MAN1= RtConfig.1 peval.1 rpslcheck.1 IRR-Errors.1 MAN3= librpsl.3 -.include <bsd.port.pre.mk> +ALL_TARGET= depend all post-extract: @${RM} ${WRKSRC}/man/man1/CIDRAdvisor.1 ${WRKSRC}/man/man1/prpath.1 @@ -39,10 +39,4 @@ post-patch: ${WRKSRC}/src/irr/birdwhoisc.cc @${RM} ${WRKSRC}/man/man1/*.orig -ALL_TARGET= depend all - -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/netmond/Makefile b/net-mgmt/netmond/Makefile index 0b4cada89072..7ad854908d81 100644 --- a/net-mgmt/netmond/Makefile +++ b/net-mgmt/netmond/Makefile @@ -83,10 +83,4 @@ do-install: post-install: ${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/nsca/Makefile b/net-mgmt/nsca/Makefile index b5f9e9e648b4..b2495fc95e52 100644 --- a/net-mgmt/nsca/Makefile +++ b/net-mgmt/nsca/Makefile @@ -52,8 +52,4 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif -.include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= does not build on 4.x -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/pftabled/Makefile b/net-mgmt/pftabled/Makefile index 4b8e84bb8c8e..d7133f241953 100644 --- a/net-mgmt/pftabled/Makefile +++ b/net-mgmt/pftabled/Makefile @@ -22,10 +22,4 @@ PLIST_FILES= bin/pftabled-client sbin/pftabled GNU_CONFIGURE= yes USE_GMAKE= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/trafd/Makefile b/net-mgmt/trafd/Makefile index af43df0db2ea..38ad451a07d1 100644 --- a/net-mgmt/trafd/Makefile +++ b/net-mgmt/trafd/Makefile @@ -16,15 +16,7 @@ MAINTAINER= bms@FreeBSD.org COMMENT= The BPF Traffic Collector CONFLICTS= bpft-4.* - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -RUN_DEPENDS= ${LOCALBASE}/etc/rc.subr:${PORTSDIR}/sysutils/rc_subr -RCSUBRBASE= ${LOCALBASE}/etc -.else RCSUBRBASE= /etc -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/trafd/trafd ${PREFIX}/bin @@ -47,4 +39,4 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/weplab/Makefile b/net-mgmt/weplab/Makefile index 9277d44d92d7..4b8ed2c8663d 100644 --- a/net-mgmt/weplab/Makefile +++ b/net-mgmt/weplab/Makefile @@ -18,14 +18,8 @@ GNU_CONFIGURE= yes MAN1= weplab.1 PLIST_FILES= bin/weplab -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= Doesn't build on 4.x -.endif - post-patch: @${REINPLACE_CMD} -E 's,^(CC|CFLAGS|LDFLAGS) *=,\1 ?=,g' \ ${WRKSRC}/Makefile.in -.include <bsd.port.post.mk> +.include <bsd.port.mk> |