diff options
-rw-r--r-- | audio/herrie/Makefile | 2 | ||||
-rw-r--r-- | audio/libaiff/Makefile | 8 | ||||
-rw-r--r-- | audio/libmpd/Makefile | 1 | ||||
-rw-r--r-- | audio/mp3plot/Makefile | 4 | ||||
-rw-r--r-- | audio/murmur/Makefile | 3 | ||||
-rw-r--r-- | audio/murmur/files/freebsd6-patch-compiler.pri | 24 | ||||
-rw-r--r-- | audio/musepack/Makefile | 9 | ||||
-rw-r--r-- | audio/ncmpcpp/Makefile | 4 | ||||
-rw-r--r-- | audio/py-pyliblo/Makefile | 8 | ||||
-rw-r--r-- | benchmarks/netperfmeter/Makefile | 8 | ||||
-rw-r--r-- | chinese/gcin/Makefile | 4 | ||||
-rw-r--r-- | chinese/xsim/Makefile | 8 | ||||
-rw-r--r-- | comms/fldigi/Makefile | 4 | ||||
-rw-r--r-- | comms/gammu-devel/Makefile | 7 | ||||
-rw-r--r-- | comms/gammu/Makefile | 3 | ||||
-rw-r--r-- | comms/uarduno/Makefile | 4 |
16 files changed, 9 insertions, 92 deletions
diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile index 022713a9533c..4a2ec9aafc49 100644 --- a/audio/herrie/Makefile +++ b/audio/herrie/Makefile @@ -36,7 +36,7 @@ MANCOMPRESSED= yes .include <bsd.port.pre.mk> -.if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033) +.if ${OSVERSION} < 700033 CONFIGURE_ARGS+=ncurses .endif diff --git a/audio/libaiff/Makefile b/audio/libaiff/Makefile index dd2e5b64c584..479ec4581389 100644 --- a/audio/libaiff/Makefile +++ b/audio/libaiff/Makefile @@ -21,14 +21,8 @@ PLIST_FILES= lib/${PORTNAME}.a include/${PORTNAME}/config.h include/${PORTNAME}/ include/${PORTNAME}/${PORTNAME}.h include/${PORTNAME}/config.vc.h PLIST_DIRS= include/${PORTNAME} -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -e 's/install: libaiff.a/install:/' \ ${WRKSRC}/${MAKEFILE}.in -.if ${OSVERSION} < 700042 -BROKEN= does not build on 6.x. -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile index 2c19db713cfb..1105ea840399 100644 --- a/audio/libmpd/Makefile +++ b/audio/libmpd/Makefile @@ -18,6 +18,7 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_GNOME= pkgconfig glib20 gnomehack USE_LDCONFIG= yes +WITH_FBSD10_FIX=yes post-patch: @${REINPLACE_CMD} -e 's,libmpd-1.0\/libmpd,libmpd,' \ diff --git a/audio/mp3plot/Makefile b/audio/mp3plot/Makefile index a2e3b89adea2..461b36b602e9 100644 --- a/audio/mp3plot/Makefile +++ b/audio/mp3plot/Makefile @@ -33,10 +33,6 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 700000 -BROKEN= does not compile -.endif - .if defined(WITHOUT_GD) CONFIGURE_ARGS+= --disable-gd .else diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile index 233c2683dc9a..254821bb5d60 100644 --- a/audio/murmur/Makefile +++ b/audio/murmur/Makefile @@ -53,9 +53,6 @@ CONFIG+= no-bonjour .endif post-patch: -.if ${OSVERSION} < 700000 - @cd ${WRKSRC} && ${PATCH} -sp < ${PATCHDIR}/freebsd6-patch-compiler.pri -.endif .if ${OSVERSION} >= 800000 @${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro .endif diff --git a/audio/murmur/files/freebsd6-patch-compiler.pri b/audio/murmur/files/freebsd6-patch-compiler.pri deleted file mode 100644 index a453045200da..000000000000 --- a/audio/murmur/files/freebsd6-patch-compiler.pri +++ /dev/null @@ -1,24 +0,0 @@ ---- compiler.pri.orig 2009-12-10 21:05:44.000000000 +0300 -+++ compiler.pri 2009-12-23 03:50:17.000000000 +0300 -@@ -68,8 +68,8 @@ - - unix { - DEFINES *= RESTRICT=__restrict__ -- QMAKE_CFLAGS *= -Wfatal-errors -Wshadow -Wconversion -Wsign-compare -fvisibility=hidden -- QMAKE_CXXFLAGS *= -Wfatal-errors -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare -fvisibility=hidden -+ QMAKE_CFLAGS *= -Wshadow -Wconversion -Wsign-compare -+ QMAKE_CXXFLAGS *= -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare - - CONFIG(opt-gcc) { - QMAKE_CC = /opt/gcc/bin/gcc -@@ -91,8 +91,8 @@ - - unix:!macx { - CONFIG(debug, debug|release) { -- QMAKE_CFLAGS *= -fstack-protector -fPIE -pie -- QMAKE_CXXFLAGS *= -fstack-protector -fPIE -pie -+ QMAKE_CFLAGS *= -fPIE -pie -+ QMAKE_CXXFLAGS *= -fPIE -pie - QMAKE_LFLAGS = -Wl - } - diff --git a/audio/musepack/Makefile b/audio/musepack/Makefile index e900fe97fe0d..d0b658be60fb 100644 --- a/audio/musepack/Makefile +++ b/audio/musepack/Makefile @@ -20,11 +20,4 @@ USE_AUTOTOOLS= aclocal autoheader libtoolize automake autoconf libtool ACLOCAL_ARGS= -I. -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing -.include <bsd.port.pre.mk> - -post-patch: -.if ${OSVERSION} < 700000 - @${REINPLACE_CMD} '/^AM_CFLAGS =/s/-fvisibility=hidden//' ${WRKSRC}/libmpcdec/Makefile.am -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile index 8b2dde14cd6d..56c27aa5a33d 100644 --- a/audio/ncmpcpp/Makefile +++ b/audio/ncmpcpp/Makefile @@ -40,10 +40,6 @@ OPTIONS= CURL "Enable fetching lyrics from the Internet" on \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 700000 -BROKEN=>>Does not compile on FreeBSD 6.X -.endif - .if defined(WITH_NCURSES_BASE) # no need to use ncurses-config if we use ncurses from the base system CONFIGURE_ARGS+= NCURSES_CONFIG=/usr/bin/true diff --git a/audio/py-pyliblo/Makefile b/audio/py-pyliblo/Makefile index 46ebaa67dd3c..db997be9244e 100644 --- a/audio/py-pyliblo/Makefile +++ b/audio/py-pyliblo/Makefile @@ -37,10 +37,4 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/doc/examples.html ${DOCSDIR} .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -USE_GCC= 4.2+ -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/benchmarks/netperfmeter/Makefile b/benchmarks/netperfmeter/Makefile index 14e836ce7760..5300eccd8125 100644 --- a/benchmarks/netperfmeter/Makefile +++ b/benchmarks/netperfmeter/Makefile @@ -24,10 +24,4 @@ LICENSE_FILE= ${WRKSRC}/COPYING MAKE_JOBS_SAFE= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -IGNORE= not supported on systems earlier than 7.x -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile index 327de28e435e..99f516adeba5 100644 --- a/chinese/gcin/Makefile +++ b/chinese/gcin/Makefile @@ -43,10 +43,6 @@ LIB_DEPENDS+= mng:${PORTSDIR}/graphics/libmng .include <bsd.port.pre.mk> -.if ${OSVERSION} < 700000 -BROKEN= does not compile -.endif - .if defined(WITH_ANTHY) BUILD_DEPENDS+= ${LOCALBASE}/include/anthy/anthy.h:${PORTSDIR}/japanese/anthy RUN_DEPENDS+= ${LOCALBASE}/include/anthy/anthy.h:${PORTSDIR}/japanese/anthy diff --git a/chinese/xsim/Makefile b/chinese/xsim/Makefile index 8e08bc8119f8..3da9bb1bb41e 100644 --- a/chinese/xsim/Makefile +++ b/chinese/xsim/Makefile @@ -25,14 +25,8 @@ PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message xsim.sh USE_BDB= 40+ -.include <bsd.port.pre.mk> - CFLAGS+= -fPIC -.if ${OSVERSION} < 700000 -MAKE_ARGS+= gcclib=`${CXX} -print-file-name=libgcc_pic.a` -.else MAKE_ARGS+= gcclib=`${CXX} -print-file-name=libgcc_s.so` -.endif post-patch: @${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \ @@ -50,4 +44,4 @@ post-install: @${CP} -R ${WRKDIR}/usr/local/xsim/dat/* ${DATADIR}/dat @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile index 842259f100a5..a6a40f8a7ca7 100644 --- a/comms/fldigi/Makefile +++ b/comms/fldigi/Makefile @@ -42,9 +42,7 @@ OPTIONS= NATIVE_OPT "Enable Native Optimizations" off \ HAMLIB "Support rig control via hamlib" on \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 700000 -USE_GCC= 4.2+ -.endif + .if ${ARCH} == "sparc64" BROKEN= Fails to install .endif diff --git a/comms/gammu-devel/Makefile b/comms/gammu-devel/Makefile index 7fc6854544b5..c377e331f391 100644 --- a/comms/gammu-devel/Makefile +++ b/comms/gammu-devel/Makefile @@ -48,12 +48,7 @@ post-install: ${PYTHON_CMD} ${opt} -m compileall -l ${PYTHONPREFIX_SITELIBDIR}/gammu .endfor -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -i '' -e 's:bash:sh:' -e 's:dialog:cdialog:' ${WRKSRC}/utils/gammu-config -.if ${OSVERSION} < 700042 - @${REINPLACE_CMD} -e 's@ -Wno-pointer-sign@@g' ${WRKSRC}/CMakeLists.txt -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile index b9d3e21c391e..ff6e1155f256 100644 --- a/comms/gammu/Makefile +++ b/comms/gammu/Makefile @@ -54,9 +54,6 @@ post-patch: @${REINPLACE_CMD} -i '' -e 's:bash:sh:' -e 's:dialog:cdialog:' ${WRKSRC}/utils/gammu-config @${REINPLACE_CMD} -i '' -e 's:/etc/bash_completion.d:${PREFIX}/etc/bash_completion.d:' \ ${WRKSRC}/contrib/CMakeLists.txt -.if ${OSVERSION} < 700042 - @${REINPLACE_CMD} -e 's@ -Wno-pointer-sign@@g' ${WRKSRC}/CMakeLists.txt -.endif .if defined(WITH_BASH) BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash diff --git a/comms/uarduno/Makefile b/comms/uarduno/Makefile index ca41501cccb5..fe1fbf3379e6 100644 --- a/comms/uarduno/Makefile +++ b/comms/uarduno/Makefile @@ -43,10 +43,6 @@ CFLAGS+= -DKERNELVER=${OSVERSION} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 700000 -BROKEN= not tested for earlier than 7.x, probably won't build -.endif - .if ${OSVERSION} < 800000 # Simple check for 7.x kernel source (find usb.c) .if ! exists(${SRCPREFIX}/sys/dev/usb/usb.c) |