diff options
-rw-r--r-- | net/pfflowd/Makefile | 9 | ||||
-rw-r--r-- | security/pfw/Makefile | 6 | ||||
-rw-r--r-- | sysutils/ipa/Makefile | 3 | ||||
-rw-r--r-- | sysutils/pfstat/Makefile | 9 | ||||
-rw-r--r-- | sysutils/pftop/Makefile | 14 | ||||
-rw-r--r-- | www/squid/Makefile | 5 | ||||
-rw-r--r-- | www/squid25/Makefile | 5 | ||||
-rw-r--r-- | www/squid26/Makefile | 5 | ||||
-rw-r--r-- | www/squid27/Makefile | 5 | ||||
-rw-r--r-- | www/squid30/Makefile | 5 | ||||
-rw-r--r-- | www/squid31/Makefile | 5 |
11 files changed, 14 insertions, 57 deletions
diff --git a/net/pfflowd/Makefile b/net/pfflowd/Makefile index 4f7287e76974..565a07888987 100644 --- a/net/pfflowd/Makefile +++ b/net/pfflowd/Makefile @@ -20,19 +20,14 @@ PLIST_FILES= sbin/pfflowd \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -IGNORE= "Only for 5.0 and above" +.if ${OSVERSION} < 502106 +IGNORE= "Only for 5.3 and above" .endif .if ${OSVERSION} < 502119 EXTRA_PATCHES+= ${FILESDIR}/pf34-Makefile .endif -.if ${OSVERSION} < 502106 -BUILD_DEPENDS= ${LOCALBASE}/include/pf/net/pfvar.h:${PORTSDIR}/security/pf -RUN_DEPENDS= ${LOCALBASE}/modules/pf.ko:${PORTSDIR}/security/pf -.endif - post-patch: ${SED} -e 's|@@PREFIX@@|${PREFIX}|g' < ${FILESDIR}/pfflowd.sh.sample \ > ${WRKSRC}/pfflowd.sh.sample diff --git a/security/pfw/Makefile b/security/pfw/Makefile index 397df623889f..301b609adcb9 100644 --- a/security/pfw/Makefile +++ b/security/pfw/Makefile @@ -28,10 +28,8 @@ SUB_LIST= PFW_PREFIX=${PFW_PREFIX} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -IGNORE= pf is only in 5.x -.elif ${OSVERSION} < 502105 -RUN_DEPENDS+= pf:${PORTSDIR}/security/pf +.if ${OSVERSION} < 502105 +IGNORE= pf is only in 5.x and newer .endif do-install: diff --git a/sysutils/ipa/Makefile b/sysutils/ipa/Makefile index 4b21d412aa00..36e81884f216 100644 --- a/sysutils/ipa/Makefile +++ b/sysutils/ipa/Makefile @@ -23,8 +23,7 @@ MAKE_ENV= NOPORTDOCS="${NOPORTDOCS}" .endif .ifdef WITH_PF -DEPENDS= ${PORTSDIR}/security/pf -PF_INCLUDE_DIR?= ${PREFIX}/include/pf +PF_INCLUDE_DIR?= /usr/include/net MAKE_ARGS+= PF_INCLUDE_DIR=${PF_INCLUDE_DIR} .endif diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile index e2b9387c0e73..482f14ba368a 100644 --- a/sysutils/pfstat/Makefile +++ b/sysutils/pfstat/Makefile @@ -32,15 +32,8 @@ PLIST_FILES= bin/pfstat .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -IGNORE= "Only for 5.0 and above" -.endif - .if ${OSVERSION} < 502106 -BUILD_DEPENDS= ${LOCALBASE}/include/pf/net/pfvar.h:${PORTSDIR}/security/pf -RUN_DEPENDS= ${LOCALBASE}/modules/pf.ko:${PORTSDIR}/security/pf - -CFLAGS+= -I${LOCALBASE}/include/pf +IGNORE= "Only for 5.3 and above" .endif post-patch: diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile index b03dbe16f911..a8cfbd87b2b7 100644 --- a/sysutils/pftop/Makefile +++ b/sysutils/pftop/Makefile @@ -21,8 +21,8 @@ MANCOMPRESSED= no .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -IGNORE= Only for 5.0 and above +.if ${OSVERSION} < 502106 +IGNORE= Only for 5.3 and above .endif .if ${OSVERSION} < 502116 @@ -38,16 +38,6 @@ MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=37 CFLAGS+= -DHAVE_ALTQ=1 .endif -.if ${OSVERSION} < 502106 -BUILD_DEPENDS= ${LOCALBASE}/include/pf/net/pfvar.h:${PORTSDIR}/security/pf -.if defined(WITH_ALTQ) && (${WITH_ALTQ} == "yes") -BUILD_DEPENDS+=${LOCALBASE}/include/pf/altq/altq.h:${PORTSDIR}/security/pf -.endif -RUN_DEPENDS= ${LOCALBASE}/modules/pf.ko:${PORTSDIR}/security/pf - -CFLAGS+= -I${LOCALBASE}/include/pf -.endif - PLIST_FILES= sbin/pftop do-install: diff --git a/www/squid/Makefile b/www/squid/Makefile index fd83f4f8a680..c64c1eef7263 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -296,10 +296,7 @@ CONFIGURE_ARGS+= --enable-arp-acl .if defined(WITH_SQUID_PF) CONFIGURE_ARGS+= --enable-pf-transparent .if ${OSVERSION} < 502106 -pf_includedir= ${LOCALBASE}/include/pf -BUILD_DEPENDS+= ${pf_includedir}/net/pfvar.h:${PORTSDIR}/security/pf -CFLAGS+= -I${pf_includedir} -EXTRA_PATCHES+= ${WRKDIR}/pf_from_ports.patch +IGNORE= pf available only in FreeBSD 5.3 and newer .endif .endif # IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE, diff --git a/www/squid25/Makefile b/www/squid25/Makefile index fd83f4f8a680..c64c1eef7263 100644 --- a/www/squid25/Makefile +++ b/www/squid25/Makefile @@ -296,10 +296,7 @@ CONFIGURE_ARGS+= --enable-arp-acl .if defined(WITH_SQUID_PF) CONFIGURE_ARGS+= --enable-pf-transparent .if ${OSVERSION} < 502106 -pf_includedir= ${LOCALBASE}/include/pf -BUILD_DEPENDS+= ${pf_includedir}/net/pfvar.h:${PORTSDIR}/security/pf -CFLAGS+= -I${pf_includedir} -EXTRA_PATCHES+= ${WRKDIR}/pf_from_ports.patch +IGNORE= pf available only in FreeBSD 5.3 and newer .endif .endif # IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE, diff --git a/www/squid26/Makefile b/www/squid26/Makefile index fd83f4f8a680..c64c1eef7263 100644 --- a/www/squid26/Makefile +++ b/www/squid26/Makefile @@ -296,10 +296,7 @@ CONFIGURE_ARGS+= --enable-arp-acl .if defined(WITH_SQUID_PF) CONFIGURE_ARGS+= --enable-pf-transparent .if ${OSVERSION} < 502106 -pf_includedir= ${LOCALBASE}/include/pf -BUILD_DEPENDS+= ${pf_includedir}/net/pfvar.h:${PORTSDIR}/security/pf -CFLAGS+= -I${pf_includedir} -EXTRA_PATCHES+= ${WRKDIR}/pf_from_ports.patch +IGNORE= pf available only in FreeBSD 5.3 and newer .endif .endif # IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE, diff --git a/www/squid27/Makefile b/www/squid27/Makefile index fd83f4f8a680..c64c1eef7263 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -296,10 +296,7 @@ CONFIGURE_ARGS+= --enable-arp-acl .if defined(WITH_SQUID_PF) CONFIGURE_ARGS+= --enable-pf-transparent .if ${OSVERSION} < 502106 -pf_includedir= ${LOCALBASE}/include/pf -BUILD_DEPENDS+= ${pf_includedir}/net/pfvar.h:${PORTSDIR}/security/pf -CFLAGS+= -I${pf_includedir} -EXTRA_PATCHES+= ${WRKDIR}/pf_from_ports.patch +IGNORE= pf available only in FreeBSD 5.3 and newer .endif .endif # IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE, diff --git a/www/squid30/Makefile b/www/squid30/Makefile index fd83f4f8a680..c64c1eef7263 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -296,10 +296,7 @@ CONFIGURE_ARGS+= --enable-arp-acl .if defined(WITH_SQUID_PF) CONFIGURE_ARGS+= --enable-pf-transparent .if ${OSVERSION} < 502106 -pf_includedir= ${LOCALBASE}/include/pf -BUILD_DEPENDS+= ${pf_includedir}/net/pfvar.h:${PORTSDIR}/security/pf -CFLAGS+= -I${pf_includedir} -EXTRA_PATCHES+= ${WRKDIR}/pf_from_ports.patch +IGNORE= pf available only in FreeBSD 5.3 and newer .endif .endif # IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE, diff --git a/www/squid31/Makefile b/www/squid31/Makefile index fd83f4f8a680..c64c1eef7263 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -296,10 +296,7 @@ CONFIGURE_ARGS+= --enable-arp-acl .if defined(WITH_SQUID_PF) CONFIGURE_ARGS+= --enable-pf-transparent .if ${OSVERSION} < 502106 -pf_includedir= ${LOCALBASE}/include/pf -BUILD_DEPENDS+= ${pf_includedir}/net/pfvar.h:${PORTSDIR}/security/pf -CFLAGS+= -I${pf_includedir} -EXTRA_PATCHES+= ${WRKDIR}/pf_from_ports.patch +IGNORE= pf available only in FreeBSD 5.3 and newer .endif .endif # IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE, |