diff options
-rw-r--r-- | audio/akode-plugins-jack/Makefile | 2 | ||||
-rw-r--r-- | audio/xmms-quix3dn/Makefile | 9 | ||||
-rw-r--r-- | biology/blast/Makefile | 2 | ||||
-rw-r--r-- | cad/geda-gattrib/Makefile | 8 | ||||
-rw-r--r-- | cad/geda-gschem/Makefile | 8 | ||||
-rw-r--r-- | cad/geda-netlist/Makefile | 8 | ||||
-rw-r--r-- | cad/geda-symcheck/Makefile | 8 | ||||
-rw-r--r-- | cad/geda-utils/Makefile | 8 | ||||
-rw-r--r-- | cad/gtkwave/Makefile | 8 | ||||
-rw-r--r-- | cad/qcad/Makefile | 6 | ||||
-rw-r--r-- | chinese/BBMan/Makefile | 5 |
11 files changed, 11 insertions, 61 deletions
diff --git a/audio/akode-plugins-jack/Makefile b/audio/akode-plugins-jack/Makefile index e1e819eaf59c..a04d468c2b14 100644 --- a/audio/akode-plugins-jack/Makefile +++ b/audio/akode-plugins-jack/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ .include <bsd.port.pre.mk> -.if (${OSVERSION} > 500000 ) && (${OSVERSION} < 502102 ) +.if (${OSVERSION} < 502102 ) IGNORE= Jack not available .endif diff --git a/audio/xmms-quix3dn/Makefile b/audio/xmms-quix3dn/Makefile index 458265e7d532..7d400ece2dd2 100644 --- a/audio/xmms-quix3dn/Makefile +++ b/audio/xmms-quix3dn/Makefile @@ -16,6 +16,7 @@ DISTNAME= quix3dn-${PORTVERSION}-freebsd MAINTAINER= ports@FreeBSD.org COMMENT= A 3D-sound effect plugin for XMMS +LIB_DEPENDS= c.4:${PORTSDIR}/misc/compat4x RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms USE_X_PREFIX= yes @@ -24,13 +25,7 @@ NO_WRKSUBDIR= yes PLIST_FILES= lib/xmms/Effect/libquix3dn.so ONLY_FOR_ARCHS= i386 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500000 -LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x -.endif - do-install: ${INSTALL_DATA} ${WRKSRC}/libquix3dn.so ${PREFIX}/lib/xmms/Effect/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/biology/blast/Makefile b/biology/blast/Makefile index 5299f94a01c6..1fc2234aa714 100644 --- a/biology/blast/Makefile +++ b/biology/blast/Makefile @@ -46,7 +46,7 @@ DISTNAME= blast${PORTVERSION:S/.0//}.freebsd-6.x-x64 DISTNAME= blast${PORTVERSION:S/.0//}.freebsd-5.x-x64 .endif .else -.if ${OSVERSION} >= 50000 && ${OSVERSION} < 600000 +.if ${OSVERSION} < 600000 DISTNAME= blast${PORTVERSION:S/.0//}.freebsd-5.x-i686 .else DISTNAME= blast${PORTVERSION:S/.0//}.freebsd-6.x-i686 diff --git a/cad/geda-gattrib/Makefile b/cad/geda-gattrib/Makefile index 567799e420ca..e1072a0b2de3 100644 --- a/cad/geda-gattrib/Makefile +++ b/cad/geda-gattrib/Makefile @@ -29,15 +29,9 @@ CONFIGURE_ARGS= --with-docdir=${DOCSDIR} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= does not compile on 4.x -.endif - post-patch: @${REINPLACE_CMD} -E \ -e "s,^(DATADIR[[:space:]]*=[[:space:]]*)gEDA,\1geda," \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile index 40750a679525..0dabc50d3a4b 100644 --- a/cad/geda-gschem/Makefile +++ b/cad/geda-gschem/Makefile @@ -39,15 +39,9 @@ CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= does not compile on 4.x -.endif - post-patch: @${REINPLACE_CMD} -E \ -e "s,^(DATADIR[[:space:]]*=[[:space:]]*)gEDA,\1geda," \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/cad/geda-netlist/Makefile b/cad/geda-netlist/Makefile index 454e6ebf3327..4b776062d6d7 100644 --- a/cad/geda-netlist/Makefile +++ b/cad/geda-netlist/Makefile @@ -31,15 +31,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gnetlist.1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= does not compile on 4.x -.endif - post-patch: @${REINPLACE_CMD} -E \ -e "s,^(DATADIR[[:space:]]*=[[:space:]]*)gEDA,\1geda," \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/cad/geda-symcheck/Makefile b/cad/geda-symcheck/Makefile index e7657809e305..6543e833d330 100644 --- a/cad/geda-symcheck/Makefile +++ b/cad/geda-symcheck/Makefile @@ -31,15 +31,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gsymcheck.1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= does not compile on 4.x -.endif - post-patch: @${REINPLACE_CMD} -E \ -e "s,^(DATADIR[[:space:]]*=[[:space:]]*)gEDA,\1geda," \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile index c7242842c729..7b4b59ab3a46 100644 --- a/cad/geda-utils/Makefile +++ b/cad/geda-utils/Makefile @@ -32,15 +32,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= grenum.1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= does not compile on 4.x -.endif - post-patch: @${REINPLACE_CMD} -E \ -e "s,^(DATADIR[[:space:]]*=[[:space:]]*)gEDA,\1geda," \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile index 7595d6d7d159..7afb580a0989 100644 --- a/cad/gtkwave/Makefile +++ b/cad/gtkwave/Makefile @@ -26,12 +26,6 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes LDCONFIG_DIRS= ${PREFIX}/lib/gtkwave -.include <bsd.port.pre.mk> - -.if ( ${OSVERSION} < 500000 ) -USE_GCC= 3.4 -.endif - DOCS= doc/*.html doc/*.png doc/*.ps EXAMPLES= examples/*.gz examples/*.vcd @@ -47,4 +41,4 @@ post-install: cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index df38c0c754df..90d565a4519d 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -36,12 +36,6 @@ MAKE_ENV= QTDIR="${QTDIR}" MAKE="${GMAKE}" \ CFLAGS+= -O0 .endif -post-patch: -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e 's|streambuf<|streambuf\.h<|g' \ - ${WRKSRC}/qcadguiqt/src/ui/qg_commandwidget.ui -.endif - do-build: cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} bash ./build_qcad.sh notrans diff --git a/chinese/BBMan/Makefile b/chinese/BBMan/Makefile index e57e6389f409..8abfdc76b5ab 100644 --- a/chinese/BBMan/Makefile +++ b/chinese/BBMan/Makefile @@ -20,15 +20,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes USE_ZIP= yes USE_WX= 2.4 +USE_GCC= 3.3 PLIST_FILES= bin/BBMan .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500000 -USE_GCC= 3.3 -.endif - .if ${ARCH} == ia64 BROKEN= Hard-codes reference to libc_r .endif |