diff options
28 files changed, 15 insertions, 150 deletions
diff --git a/comms/ktrack/Makefile b/comms/ktrack/Makefile index a68751877906..0a93e9033ebb 100644 --- a/comms/ktrack/Makefile +++ b/comms/ktrack/Makefile @@ -29,12 +29,6 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GETTEXT= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -USE_GCC= 3.3+ -.endif - post-patch: @${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure @@ -46,4 +40,4 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/doc/en/index.docbook ${PREFIX}/share/doc/HTML/en/ktrack/ .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile index a576d8a997b7..5dc1444b104c 100644 --- a/comms/linpsk/Makefile +++ b/comms/linpsk/Makefile @@ -32,12 +32,6 @@ CONFIGURE_ARGS= --with-qtdir=${X11BASE} --prefix=${PREFIX} SUB_FILES= pkg-message -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= does not build on FreeBSD 4.x -.endif - post-patch: @${REINPLACE_CMD} -e 's|-lpthread||' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure @@ -59,4 +53,4 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/LinPSKConfig.xml ${EXAMPLESDIR} @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/comms/nec2c/Makefile b/comms/nec2c/Makefile index 394c61a74160..491af29dc1e5 100644 --- a/comms/nec2c/Makefile +++ b/comms/nec2c/Makefile @@ -23,12 +23,6 @@ COMMENT= Used to calculate antenna patterns useful to ham radio # LIB_DEPENDS= ccm:${PORTSDIR}/math/ccmath -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -USE_GCC= 3.4+ -.endif - post-patch: ${CP} ${FILESDIR}/carg.c ${WRKSRC} @@ -46,4 +40,4 @@ do-install: @${ECHO} "" .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile index 84f4608f02fb..bf918ff16129 100644 --- a/comms/qsstv/Makefile +++ b/comms/qsstv/Makefile @@ -26,13 +26,6 @@ MAKE_ARGS+= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \ DESTDIR="" TARGET="qsstv" DOCSDIR="${DOCSDIR}" -.include <bsd.port.pre.mk> - -post-patch: -.if ${OSVERSION} < 500000 - @${FIND} ${WRKSRC} -name '*.cpp' | ${XARGS} ${REINPLACE_CMD} -e 's|)round(|)rint(|g ; s|) round(|)rint(|g ; s|(round)|(rint)|' -.endif - do-configure: cd ${WRKSRC}; \ ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/qmake -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ ${PORTNAME}.pro; \ @@ -45,4 +38,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 74b89ba0cd94..a3011c4e7b5f 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -49,8 +49,7 @@ OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libedataserver_e-msgport.c .endif -.if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \ - exists(/usr/lib/libkrb5.so) +.if !defined(NO_KERBEROS) && exists(/usr/lib/libkrb5.so) CONFIGURE_ARGS+= --with-krb5=/usr .else LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal diff --git a/databases/grass/Makefile b/databases/grass/Makefile index 579dc0c4ef20..7f3006945089 100644 --- a/databases/grass/Makefile +++ b/databases/grass/Makefile @@ -76,12 +76,6 @@ OPTIONS= MYSQL "Enable MySQL support" Off \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -PLIST_SUB+= FBSD4="" -.else -PLIST_SUB+= FBSD4="@comment " -.endif - .if !defined (GRASS_INST_DIR) GRASS_INST_DIR= ${PORTNAME} .endif diff --git a/databases/grass/pkg-plist b/databases/grass/pkg-plist index 7d36fdcfc28d..41d0c00f17af 100644 --- a/databases/grass/pkg-plist +++ b/databases/grass/pkg-plist @@ -370,19 +370,6 @@ bin/grass62 %%GRASS_INST_DIR%%/bwidget/utils.tcl %%GRASS_INST_DIR%%/bwidget/widget.tcl %%GRASS_INST_DIR%%/bwidget/xpm2image.tcl -%%FBSD4%%%%GRASS_INST_DIR%%/docs/html/database.html -%%FBSD4%%%%GRASS_INST_DIR%%/docs/html/display.html -%%FBSD4%%%%GRASS_INST_DIR%%/docs/html/full_index.html -%%FBSD4%%%%GRASS_INST_DIR%%/docs/html/general.html -%%FBSD4%%%%GRASS_INST_DIR%%/docs/html/imagery.html -%%FBSD4%%%%GRASS_INST_DIR%%/docs/html/index.html -%%FBSD4%%%%GRASS_INST_DIR%%/docs/html/paint.html -%%FBSD4%%%%GRASS_INST_DIR%%/docs/html/photo.html -%%FBSD4%%%%GRASS_INST_DIR%%/docs/html/postGRASS.html -%%FBSD4%%%%GRASS_INST_DIR%%/docs/html/postscript.html -%%FBSD4%%%%GRASS_INST_DIR%%/docs/html/raster.html -%%FBSD4%%%%GRASS_INST_DIR%%/docs/html/raster3D.html -%%FBSD4%%%%GRASS_INST_DIR%%/docs/html/vector.html %%GRASS_INST_DIR%%/docs/html/d.ask.html %%GRASS_INST_DIR%%/docs/html/d.barscale.html %%GRASS_INST_DIR%%/docs/html/d.colorlist.html diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile index ed09ef6471fc..9f1fa4856d2a 100644 --- a/databases/hk_classes/Makefile +++ b/databases/hk_classes/Makefile @@ -54,10 +54,6 @@ MAN1= hk_report.1man hk_actionquery.1man hk_exportxml.1man \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -IGNORE= there is no wchar support -.endif - .if !defined(WITHOUT_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql-dir=${LOCALBASE} \ diff --git a/databases/libpbl/Makefile b/databases/libpbl/Makefile index 1ac09d539021..f329af58c1c7 100644 --- a/databases/libpbl/Makefile +++ b/databases/libpbl/Makefile @@ -22,14 +22,10 @@ PLIST_FILES= lib/libpbl.a include/pbl.h PORTDOCS= * .endif -.include <bsd.port.pre.mk> - post-extract: @${REINPLACE_CMD} -e 's/= -Wall -O3/+= -Wall/' \ -e 's/^CC=/CC?=/' ${WRKSRC}/makefile -.if ${OSVERSION} >= 500000 @${REINPLACE_CMD} -e 's/%d/%zd/' ${WRKSRC}/pbl.c -.endif @${REINPLACE_CMD} -e 's/dir\.h/dirent\.h/' ${WRKSRC}/pbl.h @${REINPLACE_CMD} -e 's/malloc\.h/stdlib\.h/' \ ${WRKSRC}/pbl.c ${WRKSRC}/pblhash.c @@ -44,4 +40,4 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index 315b4657cedf..b4e2b39529e8 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -77,10 +77,6 @@ CONFIGURE_ARGS+=--with-openssl .include <bsd.port.pre.mk> -.if ${ARCH} == "alpha" && ${OSVERSION} < 500000 -BROKEN= Coredump during build on alpha 4.x -.endif - .if !defined(SLAVE_ONLY) # gnugetopt will always be used if already installed . if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h) diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index 23658a445786..5bdcae1695df 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -77,10 +77,6 @@ CONFIGURE_ARGS+=--with-openssl .include <bsd.port.pre.mk> -.if ${ARCH} == "alpha" && ${OSVERSION} < 500000 -BROKEN= Coredump during build on alpha 4.x -.endif - .if !defined(SLAVE_ONLY) # gnugetopt will always be used if already installed . if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h) diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index 23658a445786..5bdcae1695df 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -77,10 +77,6 @@ CONFIGURE_ARGS+=--with-openssl .include <bsd.port.pre.mk> -.if ${ARCH} == "alpha" && ${OSVERSION} < 500000 -BROKEN= Coredump during build on alpha 4.x -.endif - .if !defined(SLAVE_ONLY) # gnugetopt will always be used if already installed . if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h) diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 23658a445786..5bdcae1695df 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -77,10 +77,6 @@ CONFIGURE_ARGS+=--with-openssl .include <bsd.port.pre.mk> -.if ${ARCH} == "alpha" && ${OSVERSION} < 500000 -BROKEN= Coredump during build on alpha 4.x -.endif - .if !defined(SLAVE_ONLY) # gnugetopt will always be used if already installed . if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h) diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index 23658a445786..5bdcae1695df 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -77,10 +77,6 @@ CONFIGURE_ARGS+=--with-openssl .include <bsd.port.pre.mk> -.if ${ARCH} == "alpha" && ${OSVERSION} < 500000 -BROKEN= Coredump during build on alpha 4.x -.endif - .if !defined(SLAVE_ONLY) # gnugetopt will always be used if already installed . if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h) diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 23658a445786..5bdcae1695df 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -77,10 +77,6 @@ CONFIGURE_ARGS+=--with-openssl .include <bsd.port.pre.mk> -.if ${ARCH} == "alpha" && ${OSVERSION} < 500000 -BROKEN= Coredump during build on alpha 4.x -.endif - .if !defined(SLAVE_ONLY) # gnugetopt will always be used if already installed . if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h) diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 23658a445786..5bdcae1695df 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -77,10 +77,6 @@ CONFIGURE_ARGS+=--with-openssl .include <bsd.port.pre.mk> -.if ${ARCH} == "alpha" && ${OSVERSION} < 500000 -BROKEN= Coredump during build on alpha 4.x -.endif - .if !defined(SLAVE_ONLY) # gnugetopt will always be used if already installed . if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h) diff --git a/databases/tora/Makefile b/databases/tora/Makefile index 88ea200c19fe..f98097705996 100644 --- a/databases/tora/Makefile +++ b/databases/tora/Makefile @@ -52,11 +52,6 @@ PREFIX2FIX= help/preferences.html totool.cpp .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -# Just defining time_t as long in topiechart.h could be sufficient? -BROKEN= does not compile with gcc 2.95 -.endif - .if ${OSVERSION} >= 700000 BROKEN= does not link with oracle8-client .endif diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index b4160707e1a8..6e868e59e07b 100644 --- a/databases/virtuoso/Makefile +++ b/databases/virtuoso/Makefile @@ -53,10 +53,6 @@ post-install: .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -IGNORE= requires wchar_t -.endif - .if ${OSVERSION} < 504000 CHECK_PORT= ${LOCALBASE}/bin/nc -vz localhost $$\1 2>\&1 | ${GREP} open BUILD_DEPENDS+= ${NETCAT}:${PORTSDIR}/net/netcat diff --git a/deskutils/adesklets/Makefile b/deskutils/adesklets/Makefile index 1e5a49106f4e..fdc198dd9d8d 100644 --- a/deskutils/adesklets/Makefile +++ b/deskutils/adesklets/Makefile @@ -34,14 +34,6 @@ INFO= adesklets \ SUB_FILES= pkg-message INSTALLS_EGGINFO= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -.endif - .if !defined(WITHOUT_PERL) USE_PERL5= yes PLIST_SUB+= PERL="" @@ -67,4 +59,4 @@ post-extract: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/buoh/Makefile b/deskutils/buoh/Makefile index 63977fabd3e6..d37ee9e816e9 100644 --- a/deskutils/buoh/Makefile +++ b/deskutils/buoh/Makefile @@ -35,12 +35,6 @@ CFLAGS+= -g STRIP= .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= Does not build on 4.X -.endif - pre-everything:: .if !defined(WITH_DEBUG) @${ECHO_MSG} "You may specify the following on the command line:" @@ -60,4 +54,4 @@ post-install: .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/calcurse/Makefile b/deskutils/calcurse/Makefile index b3e363e3459b..3c3e3a911ead 100644 --- a/deskutils/calcurse/Makefile +++ b/deskutils/calcurse/Makefile @@ -27,10 +27,4 @@ USE_GETTEXT= yes PLIST_SUB+= NLS="" .endif -.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/deskutils/katapult/Makefile b/deskutils/katapult/Makefile index e0923a8483a9..8b64d7e0b0af 100644 --- a/deskutils/katapult/Makefile +++ b/deskutils/katapult/Makefile @@ -24,10 +24,4 @@ INSTALLS_ICONS= yes USE_GETTEXT= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= doesn't buiold -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/kchm/Makefile b/deskutils/kchm/Makefile index 831d1dbee1a9..f0557bb462c8 100644 --- a/deskutils/kchm/Makefile +++ b/deskutils/kchm/Makefile @@ -23,10 +23,4 @@ USE_KDEBASE_VER=3 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= "Does not compile" -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/kdissert/Makefile b/deskutils/kdissert/Makefile index 19ff4ac5d286..78b54c1d1a23 100644 --- a/deskutils/kdissert/Makefile +++ b/deskutils/kdissert/Makefile @@ -29,10 +29,6 @@ MAKE_ENV= QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}" CXXFLAGS+= -fpermissive .endif -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - post-patch: @${REINPLACE_CMD} -e \ 's|%%LINKFLAGS%%|${PTHREAD_LIBS}|g ; \ diff --git a/deskutils/lightning-xpi/Makefile b/deskutils/lightning-xpi/Makefile index 203f5e499808..d78fb5a08fe4 100644 --- a/deskutils/lightning-xpi/Makefile +++ b/deskutils/lightning-xpi/Makefile @@ -33,7 +33,7 @@ _IGNORE_MSG= precompiled binaries, contact ahze@FreeBSD.org for build informatio ARCH_PORTVERSION?= 0.5 .if ${ARCH}=="i386" -. if ${OSVERSION} < 600000 && ${OSVERSION} > 500000 +. if ${OSVERSION} < 600000 OS_VER= 5 . elif ${OSVERSION} > 600000 && ${OSVERSION} < 700000 OS_VER= 6 @@ -51,7 +51,7 @@ OS_VER= 7 IGNORE= ${_IGNORE_MSG} . endif .elif ${ARCH}=="amd64" -. if ${OSVERSION} < 600000 && ${OSVERSION} > 500000 +. if ${OSVERSION} < 600000 OS_VER= 5 . elif ${OSVERSION} > 600000 && ${OSVERSION} < 700000 OS_VER= 6 diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile index dd839110079e..f93174e5114c 100644 --- a/deskutils/nautilus-locked-folder/Makefile +++ b/deskutils/nautilus-locked-folder/Makefile @@ -32,10 +32,5 @@ post-patch: ${WRKSRC}/src/lockedfolder-extension.c @${REINPLACE_CMD} -e 's|gladedir)"\\" \\|gladedir)"\\"|g ; \ s|.*-Werror||g' ${WRKSRC}/src/Makefile.in -.include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN="Does not build" -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/pal/Makefile b/deskutils/pal/Makefile index 19f126c9563f..a22a94cc22db 100644 --- a/deskutils/pal/Makefile +++ b/deskutils/pal/Makefile @@ -25,7 +25,7 @@ MAN1= pal.1 .include <bsd.port.pre.mk> -.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/deskutils/semantik/Makefile b/deskutils/semantik/Makefile index 19ff4ac5d286..78b54c1d1a23 100644 --- a/deskutils/semantik/Makefile +++ b/deskutils/semantik/Makefile @@ -29,10 +29,6 @@ MAKE_ENV= QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}" CXXFLAGS+= -fpermissive .endif -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - post-patch: @${REINPLACE_CMD} -e \ 's|%%LINKFLAGS%%|${PTHREAD_LIBS}|g ; \ |