diff options
49 files changed, 40 insertions, 284 deletions
diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile index 2160f873ddb4..4368cdfb5cee 100644 --- a/net-im/gajim-devel/Makefile +++ b/net-im/gajim-devel/Makefile @@ -63,10 +63,6 @@ post-install: .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= doesn\'t install -.endif - .if ${PYTHON_REL} >= 250 RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 .else diff --git a/net-im/sendxmpp/Makefile b/net-im/sendxmpp/Makefile index f5e504b42253..a2a920e46d90 100644 --- a/net-im/sendxmpp/Makefile +++ b/net-im/sendxmpp/Makefile @@ -24,10 +24,4 @@ PLIST_FILES= bin/sendxmpp \ %%SITE_PERL%%/mach/auto/sendxmpp/.packlist PLIST_DIRS= %%SITE_PERL%%/mach/auto/sendxmpp -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= Dependencies does not build on FreeBSD < 5.x -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> 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> diff --git a/net-p2p/apollon/Makefile b/net-p2p/apollon/Makefile index 8526aebd6f0b..62791c844940 100644 --- a/net-p2p/apollon/Makefile +++ b/net-p2p/apollon/Makefile @@ -22,16 +22,10 @@ USE_KDELIBS_VER=3 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= "Does not compile on FreeBSD 4.x" -.endif - post-patch: .ifdef(NOPORTDOCS) @${REINPLACE_CMD} -E -e 's/^(all:)[[:space:]]+docs-am/\1/; s/^(SUBDIRS.+)doc/\1/' \ ${WRKSRC}/Makefile.in .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/btpeer/Makefile b/net-p2p/btpeer/Makefile index 6e4ff8d48c7e..0f56634fba67 100644 --- a/net-p2p/btpeer/Makefile +++ b/net-p2p/btpeer/Makefile @@ -38,20 +38,13 @@ post-patch: -e 's|^LIBS.+$$|LIBS=-L${OPENSSLLIB} ${PTHREAD_LIBS} -L${LOCALBASE}/lib \\|' \ ${BUILD_WRKSRC}/${MAKEFILE} -do-install: -.for file in ${PROGRAM_FILES} - @${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin/${PORTNAME}-${file} +.for f in ${PROGRAM_FILES} +PLIST_FILES+= bin/${PORTNAME}-${f} .endfor -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -IGNORE= FreeBSD prior to 500000 does not support uuid(3) required\ - for building -.endif - -.for file in ${PROGRAM_FILES} -PLIST_FILES+= bin/${PORTNAME}-${file} +do-install: +.for f in ${PROGRAM_FILES} + @${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin/${PORTNAME}-${f} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/btqueue/Makefile b/net-p2p/btqueue/Makefile index c837bd3834c9..9661c01293ba 100644 --- a/net-p2p/btqueue/Makefile +++ b/net-p2p/btqueue/Makefile @@ -29,11 +29,6 @@ OPTIONS= PYXML "Add dependency on PyXML (needed for crawler only)" on .include <bsd.port.pre.mk> -# Enable workaround for bad libc in FreeBSD 4.x -.if ${OSVERSION} < 500000 -EXTRA_PATCHES= ${FILESDIR}/FBSD4-patch-BitTorrent_defaultargs.py -.endif - .if !defined(WITHOUT_PYXML) RUN_DEPENDS+= ${PYXML} .endif diff --git a/net-p2p/createtorrent/Makefile b/net-p2p/createtorrent/Makefile index 066c3fea0904..ac6a34b9384d 100644 --- a/net-p2p/createtorrent/Makefile +++ b/net-p2p/createtorrent/Makefile @@ -20,13 +20,7 @@ USE_OPENSSL= yes PLIST_FILES= bin/createtorrent -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= does not compile on 4.x -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/dclibc/Makefile b/net-p2p/dclibc/Makefile index fd50a5401fb6..215710bee9ce 100644 --- a/net-p2p/dclibc/Makefile +++ b/net-p2p/dclibc/Makefile @@ -21,10 +21,4 @@ USE_ICONV= yes USE_GNOME= glib20 pkgconfig USE_LDCONFIG= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -IGNORE= doesn't build on FreeBSD < 5.x -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/dctc-gui-qt/Makefile b/net-p2p/dctc-gui-qt/Makefile index 2140e5bef8f9..806177e381c7 100644 --- a/net-p2p/dctc-gui-qt/Makefile +++ b/net-p2p/dctc-gui-qt/Makefile @@ -45,10 +45,6 @@ PORTDOCS= \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= "Does not compile on FreeBSD 4.x" -.endif - # with xine preview support .ifdef(WITH_XINE) LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile index df92f0d4bfd9..c0dfc38c3dc2 100644 --- a/net-p2p/jigdo/Makefile +++ b/net-p2p/jigdo/Makefile @@ -32,11 +32,6 @@ OPTIONS= GUI "Build the gtk2 gui" off \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -NOT_FOR_ARCHS+= alpha -BROKEN= Does not compile -.endif - .if defined(WITH_GUI) CONFIGURE_ARGS+= --with-gui LIB_DEPENDS+= gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \ diff --git a/net-p2p/microdc2/Makefile b/net-p2p/microdc2/Makefile index 01a1c74e414b..2c0ffc5091f2 100644 --- a/net-p2p/microdc2/Makefile +++ b/net-p2p/microdc2/Makefile @@ -20,12 +20,6 @@ GNU_CONFIGURE= yes USE_ICONV= yes USE_GNOME= libxml2 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= doesn't compile on FreeBSD 4.x -.endif - .if !defined(WITHOUT_NLS) USE_GETTEXT= yes PLIST_SUB+= NLS="" @@ -34,4 +28,4 @@ CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/minder/Makefile b/net-p2p/minder/Makefile index de8ab9657e2e..0f886c32ea71 100644 --- a/net-p2p/minder/Makefile +++ b/net-p2p/minder/Makefile @@ -50,11 +50,4 @@ do-install: @${INSTALL_DATA} ${FILESDIR}/minder.cfg.sample \ ${EXAMPLESDIR}/minder.cfg -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -IGNORE= FreeBSD prior to 500000 does not support uuid(3) required\ - for building -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile index 61d8f476c910..3bb5181dc3ea 100644 --- a/net-p2p/mldonkey-devel/Makefile +++ b/net-p2p/mldonkey-devel/Makefile @@ -110,11 +110,6 @@ ALL_TARGET+= \ .include <bsd.port.pre.mk> -# Fix build on 4.x -.if ${OSVERSION} < 500000 -USE_GCC= 3.4 -.endif - # FreeBSD has reentrant dns code .if ( ((${OSVERSION} >= 504102) && (${OSVERSION} < 600000)) || (${OSVERSION} >= 600029) ) PTHREAD_CFLAGS+= -D_REENTRANT diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile index 67356167e6b6..fee4c830ffd4 100644 --- a/net-p2p/mldonkey/Makefile +++ b/net-p2p/mldonkey/Makefile @@ -110,11 +110,6 @@ ALL_TARGET+= \ .include <bsd.port.pre.mk> -# Fix build on 4.x -.if ${OSVERSION} < 500000 -USE_GCC= 3.4 -.endif - # FreeBSD has reentrant dns code .if ( ((${OSVERSION} >= 504102) && (${OSVERSION} < 600000)) || (${OSVERSION} >= 600029) ) PTHREAD_CFLAGS+= -D_REENTRANT diff --git a/net-p2p/museek+/Makefile b/net-p2p/museek+/Makefile index b8b5804abd95..a4c0d07aae43 100644 --- a/net-p2p/museek+/Makefile +++ b/net-p2p/museek+/Makefile @@ -98,8 +98,4 @@ post-install: BROKEN= Does not compile on amd64 .endif -.if (${OSVERSION} < 500000) -IGNORE= does not compile on systems < 5.x (needs wstring support) -.endif - .include <bsd.port.post.mk> diff --git a/net-p2p/museekplus/Makefile b/net-p2p/museekplus/Makefile index b8b5804abd95..a4c0d07aae43 100644 --- a/net-p2p/museekplus/Makefile +++ b/net-p2p/museekplus/Makefile @@ -98,8 +98,4 @@ post-install: BROKEN= Does not compile on amd64 .endif -.if (${OSVERSION} < 500000) -IGNORE= does not compile on systems < 5.x (needs wstring support) -.endif - .include <bsd.port.post.mk> diff --git a/net-p2p/trackerbt/Makefile b/net-p2p/trackerbt/Makefile index ce0a6f8f2f71..8de9df90baa2 100644 --- a/net-p2p/trackerbt/Makefile +++ b/net-p2p/trackerbt/Makefile @@ -49,11 +49,4 @@ do-install: @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/config.xml ${EXAMPLESDIR} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -IGNORE= FreeBSD prior to 500000 does not support uuid(3) required\ - for building -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/news/fidogate/Makefile b/news/fidogate/Makefile index 9ee1a6cbf372..a83afe5b6f1d 100644 --- a/news/fidogate/Makefile +++ b/news/fidogate/Makefile @@ -16,6 +16,8 @@ MASTER_SITE_SUBDIR= system/fido MAINTAINER= dinoex@FreeBSD.org COMMENT= Fido-Internet Gateway and Tosser +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-perl + .if !defined(WITHOUT_IFCICO) RUN_DEPENDS= ${LOCALBASE}/libexec/ifmail/ifcico:${PORTSDIR}/news/ifmail .endif @@ -30,12 +32,6 @@ DOCLIST= fidogate.texi fidogate.txt gatebau94.txt kludge-rfc.doc \ MAKE_ENV+= CC=${CC} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} > 500000 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-perl -.endif - pre-configure: ${TOUCH} ${WRKSRC}/doc/fidogate.info ${RM} -f ${WRKSRC}/doc/fidogate.info-? @@ -62,4 +58,4 @@ post-install: @${TAR} -C ${WRKSRC}/examples -cf - . | ${TAR} -C ${EXAMPLESDIR} -xf - .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile index 94ad260d7044..b358194789c2 100644 --- a/news/hellanzb/Makefile +++ b/news/hellanzb/Makefile @@ -20,18 +20,14 @@ RUN_DEPENDS= par2:${PORTSDIR}/archivers/par2cmdline \ shorten:${PORTSDIR}/audio/shorten \ ${PYTHON_SITELIBDIR}/yenc.py:${PORTSDIR}/news/py-yenc \ ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore \ - ${PYTHON_SITELIBDIR}/twisted/web:${PORTSDIR}/www/py-twistedWeb + ${PYTHON_SITELIBDIR}/twisted/web:${PORTSDIR}/www/py-twistedWeb \ + mac:${PORTSDIR}/audio/mac USE_PYTHON= yes USE_PYDISTUTILS=yes .include <bsd.port.pre.mk> -# monkey audio (mac) needs FreeBSD 5 -.if ${OSVERSION} >= 500000 -RUN_DEPENDS+= mac:${PORTSDIR}/audio/mac -.endif - # more fully-featured rar needs at least 5.3 .if ${ARCH} == "i386" && ${OSVERSION} >= 503000 RUN_DEPENDS+= rar:${PORTSDIR}/archivers/rar diff --git a/palm/iSiloXC/Makefile b/palm/iSiloXC/Makefile index d35d47038437..7bf8c588a888 100644 --- a/palm/iSiloXC/Makefile +++ b/palm/iSiloXC/Makefile @@ -14,16 +14,13 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}BSD MAINTAINER= skv@FreeBSD.org COMMENT= Converts documents from text/html files or URLs to iSilo format +LIB_DEPENDS= c.4:${PORTSDIR}/misc/compat4x + USE_ZIP= yes NO_BUILD= yes NO_WRKSUBDIR= yes ONLY_FOR_ARCHS= i386 -.include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500000 - LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x -.endif - MAN1= iSiloXC.1 MAN5= ixl.5 MANCOMPRESSED= no @@ -39,4 +36,4 @@ do-install: @${MKDIR} ${MAN5PREFIX}/man/man5 ${INSTALL_MAN} ${WRKSRC}/ixl.5 ${MAN5PREFIX}/man/man5 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile index ac002511dd15..ee1a278a01ee 100644 --- a/polish/gnugadu2/Makefile +++ b/polish/gnugadu2/Makefile @@ -166,9 +166,6 @@ PLIST_SUB+= KDE:="@comment " post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/gg2.desktop @${REINPLACE_CMD} -e 's| -ldl|| ; s|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/lib/Makefile.in -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' ${WRKSRC}/src/plugins/gadu_gadu/libgadu/lib/libgadu-config.h.in -.endif post-install: .if (${HAVE_GNOME:Mgnomehier}!="") diff --git a/ports-mgmt/kports-qt4/Makefile b/ports-mgmt/kports-qt4/Makefile index cf93ff08ffdb..60cb195e5579 100644 --- a/ports-mgmt/kports-qt4/Makefile +++ b/ports-mgmt/kports-qt4/Makefile @@ -28,10 +28,6 @@ OPTIONS= PORTAUDIT "Require Portaudit" on .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -IGNORE= doesn't compile properly on 4.x systems -.endif - .if !defined(WITHOUT_PORTAUDIT) RUN_DEPENDS+= portaudit:${PORTSDIR}/ports-mgmt/portaudit .endif diff --git a/ports-mgmt/kports/Makefile b/ports-mgmt/kports/Makefile index cf93ff08ffdb..60cb195e5579 100644 --- a/ports-mgmt/kports/Makefile +++ b/ports-mgmt/kports/Makefile @@ -28,10 +28,6 @@ OPTIONS= PORTAUDIT "Require Portaudit" on .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -IGNORE= doesn't compile properly on 4.x systems -.endif - .if !defined(WITHOUT_PORTAUDIT) RUN_DEPENDS+= portaudit:${PORTSDIR}/ports-mgmt/portaudit .endif diff --git a/print/cups-magicolor/Makefile b/print/cups-magicolor/Makefile index 27e219c8b5f8..c807c5307b72 100644 --- a/print/cups-magicolor/Makefile +++ b/print/cups-magicolor/Makefile @@ -28,10 +28,4 @@ USE_AUTOTOOLS= automake:19:env autoconf:261 USE_GMAKE= yes GNU_CONFIGURE= 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/print/hplip/Makefile b/print/hplip/Makefile index ec1959b56fec..a03e22d7eb8e 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -44,10 +44,6 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.7.4 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - .if !defined(WITHOUT_GUI) || exists(${LOCALBASE}/bin/pylupdate) RUN_DEPENDS+= pylupdate:${PORTSDIR}/x11-toolkits/py-qt CONFIGURE_ARGS+= --enable-gui-build diff --git a/print/hplip3/Makefile b/print/hplip3/Makefile index ec1959b56fec..a03e22d7eb8e 100644 --- a/print/hplip3/Makefile +++ b/print/hplip3/Makefile @@ -44,10 +44,6 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.7.4 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - .if !defined(WITHOUT_GUI) || exists(${LOCALBASE}/bin/pylupdate) RUN_DEPENDS+= pylupdate:${PORTSDIR}/x11-toolkits/py-qt CONFIGURE_ARGS+= --enable-gui-build diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile index 58f21a1a621f..eb4e2b0163a4 100644 --- a/print/lyx-devel/Makefile +++ b/print/lyx-devel/Makefile @@ -120,8 +120,4 @@ CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30 #BROKEN= C++ compiler seg-faults, try using a different one and report to ${MAINTAINER} .endif -.if ${OSVERSION} < 500000 -#BROKEN= Does not compile on 4.x -.endif - .include <bsd.port.post.mk> diff --git a/print/lyx/Makefile b/print/lyx/Makefile index 58f21a1a621f..eb4e2b0163a4 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -120,8 +120,4 @@ CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30 #BROKEN= C++ compiler seg-faults, try using a different one and report to ${MAINTAINER} .endif -.if ${OSVERSION} < 500000 -#BROKEN= Does not compile on 4.x -.endif - .include <bsd.port.post.mk> diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile index 58f21a1a621f..eb4e2b0163a4 100644 --- a/print/lyx14/Makefile +++ b/print/lyx14/Makefile @@ -120,8 +120,4 @@ CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30 #BROKEN= C++ compiler seg-faults, try using a different one and report to ${MAINTAINER} .endif -.if ${OSVERSION} < 500000 -#BROKEN= Does not compile on 4.x -.endif - .include <bsd.port.post.mk> diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile index 58f21a1a621f..eb4e2b0163a4 100644 --- a/print/lyx15/Makefile +++ b/print/lyx15/Makefile @@ -120,8 +120,4 @@ CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30 #BROKEN= C++ compiler seg-faults, try using a different one and report to ${MAINTAINER} .endif -.if ${OSVERSION} < 500000 -#BROKEN= Does not compile on 4.x -.endif - .include <bsd.port.post.mk> diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile index 58f21a1a621f..eb4e2b0163a4 100644 --- a/print/lyx16/Makefile +++ b/print/lyx16/Makefile @@ -120,8 +120,4 @@ CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30 #BROKEN= C++ compiler seg-faults, try using a different one and report to ${MAINTAINER} .endif -.if ${OSVERSION} < 500000 -#BROKEN= Does not compile on 4.x -.endif - .include <bsd.port.post.mk> diff --git a/print/mp-letter/Makefile b/print/mp-letter/Makefile index 845b7444ccea..6a2d72d33d8f 100644 --- a/print/mp-letter/Makefile +++ b/print/mp-letter/Makefile @@ -18,11 +18,6 @@ DISTNAME= mp-3.0.1 MAINTAINER= obrien@FreeBSD.org COMMENT= A PostScript printing util for ASCII files, email, USENET news articles, etc -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -USE_GCC= 3.4 -.endif WRKSRC= ${WRKDIR}/mp MAN1= mp.1 MLINKS= mp.1 digestp.1 - filep.1 - filofaxp.1 \ @@ -42,4 +37,4 @@ pre-patch: ${WRKSRC}/header.cc ${WRKSRC}/input.cc ${WRKSRC}/main.cc \ ${WRKSRC}/print.cc ${WRKSRC}/print.hh -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/print/pips800/Makefile.pips b/print/pips800/Makefile.pips index f173823d43b4..062b80bbe4d2 100644 --- a/print/pips800/Makefile.pips +++ b/print/pips800/Makefile.pips @@ -126,12 +126,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf-2.61:${PORTSDIR}/devel/autoconf261 LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base USE_ICONV= yes .endif -.if ${OSVERSION} < 500000 -LIB_DEPENDS+= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ - lthread.2:${PORTSDIR}/devel/linuxthreads -CPPFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads -LDFLAGS+= -lgnugetopt -llthread -.else LDFLAGS+= ${PTHREAD_LIBS} .endif CPPFLAGS+= ${PTHREAD_CFLAGS} diff --git a/science/gsystem/Makefile b/science/gsystem/Makefile index 8e548e4296d2..0a303e7ab1e0 100644 --- a/science/gsystem/Makefile +++ b/science/gsystem/Makefile @@ -26,12 +26,6 @@ INSTALLS_SHLIB= yes QTDIR= ${QT_PREFIX} QMAKESPEC= freebsd-g++ -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= "does not compile with gcc 2.95" -.endif - do-configure: cd ${WRKSRC}; \ export QTDIR=${QTDIR}; \ @@ -53,4 +47,4 @@ do-install: post-install: @${CAT} ${PKGMESSAGE}; -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/science/kst/Makefile b/science/kst/Makefile index 2cc30abdcb86..65c0b0f688e3 100644 --- a/science/kst/Makefile +++ b/science/kst/Makefile @@ -32,11 +32,7 @@ MAN1= kst.1 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= does not build -.endif - -.if ${OSVERSION} < 500000 || exists(${LOCALBASE}/lib/libreadline.so.5) +.if exists(${LOCALBASE}/lib/libreadline.so.5) LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline .endif diff --git a/science/kst2/Makefile b/science/kst2/Makefile index 2cc30abdcb86..65c0b0f688e3 100644 --- a/science/kst2/Makefile +++ b/science/kst2/Makefile @@ -32,11 +32,7 @@ MAN1= kst.1 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= does not build -.endif - -.if ${OSVERSION} < 500000 || exists(${LOCALBASE}/lib/libreadline.so.5) +.if exists(${LOCALBASE}/lib/libreadline.so.5) LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline .endif diff --git a/science/lamprop/Makefile b/science/lamprop/Makefile index 325ca5965991..d5361e614659 100644 --- a/science/lamprop/Makefile +++ b/science/lamprop/Makefile @@ -25,17 +25,9 @@ MAKE_ENV= NOPORTDOCS=yes PORTDOCS= LICENSE README NEWS .endif -.include <bsd.port.pre.mk> - REP= 's|-pipe||; s|-fmerge-constants||; s|--fast-math||' -.if ${OSVERSION} < 500000 -REP2+= 's|-fno-unit-at-a-time||;' -.endif post-patch: @${REINPLACE_CMD} -e ${REP} ${WRKSRC}/Makefile -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e ${REP2} ${WRKSRC}/Makefile -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/science/mbdyn/Makefile b/science/mbdyn/Makefile index 88f695820802..97ce5da3fe50 100644 --- a/science/mbdyn/Makefile +++ b/science/mbdyn/Makefile @@ -97,8 +97,4 @@ CONFIGURE_ARGS+= --with-tcl=no BROKEN= Does not compile .endif -.if ${OSVERSION} < 500000 -BROKEN= Does not compile -.endif - .include <bsd.port.post.mk> diff --git a/science/medit/Makefile b/science/medit/Makefile index 0e27b931b642..8f607c16b51a 100644 --- a/science/medit/Makefile +++ b/science/medit/Makefile @@ -57,9 +57,7 @@ USE_GL= yes . if ${OSVERSION} < 601000 . if ${ARCH} == i386 DISTVER= 4.11 -. if ${OSVERSION} >= 500000 LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x -. endif . else BROKEN= no binary available for your platform x version at the moment . endif diff --git a/science/psi3/Makefile b/science/psi3/Makefile index 9a1f99663c41..52bd0db51755 100644 --- a/science/psi3/Makefile +++ b/science/psi3/Makefile @@ -54,10 +54,6 @@ CONFIGURE_ARGS= --with-cc=${CC} \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on FreeBSD 4.x -.endif - .if defined(WITH_OPTIMIZED_FLAGS) FFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double diff --git a/science/qcl/Makefile b/science/qcl/Makefile index ca4ec25ab4aa..d794d1f5ed45 100644 --- a/science/qcl/Makefile +++ b/science/qcl/Makefile @@ -16,14 +16,8 @@ COMMENT= A quantum computer simulator USE_GETOPT_LONG=yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= Does not compile -.endif - do-configure: echo 'PREFIX=${PREFIX}' >>${WRKSRC}/Makefile cd ${WRKSRC} && make dep -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/science/x11iraf/Makefile b/science/x11iraf/Makefile index 64685008852d..5ffdd466eedf 100644 --- a/science/x11iraf/Makefile +++ b/science/x11iraf/Makefile @@ -14,6 +14,8 @@ DISTNAME= x11iraf-v${PORTVERSION}-bin.freebsd MAINTAINER= dsyphers@u.washington.edu COMMENT= Provides graphical tools to work with IRAF +LIB_DEPENDS= c.4:${PORTSDIR}/misc/compat4x + NO_BUILD= yes USE_XLIB= yes @@ -29,12 +31,6 @@ MAN1= obmsh.1 \ ximtool.1 \ xtapemon.1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500000 -LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x -.endif - do-install: @${ECHO_MSG} "===> Installing binaries" @${INSTALL_PROGRAM} ${BINS:S|^|${WRKDIR}/bin.freebsd/|} ${PREFIX}/bin/ @@ -45,4 +41,4 @@ do-install: @${INSTALL_DATA} ${WRKDIR}/include/* ${PREFIX}/include/ @${INSTALL_DATA} ${WRKDIR}/lib.freebsd/libcdl.a ${PREFIX}/lib/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> |