diff options
author | Edwin Groothuis <edwin@FreeBSD.org> | 2007-10-04 01:14:50 +0000 |
---|---|---|
committer | Edwin Groothuis <edwin@FreeBSD.org> | 2007-10-04 01:14:50 +0000 |
commit | 42b9878de05e3fd31b1537c7fb21ea8d4260e335 (patch) | |
tree | faaedbe6ae8110bb19ce982907b65ca7c487c291 | |
parent | f7c0630cd25902e9d0299337f0075f1969f3c15c (diff) | |
download | ports-42b9878de05e3fd31b1537c7fb21ea8d4260e335.tar.gz ports-42b9878de05e3fd31b1537c7fb21ea8d4260e335.zip |
Notes
40 files changed, 28 insertions, 240 deletions
diff --git a/graphics/ale/Makefile b/graphics/ale/Makefile index 00f9b893eed9..dbb639a58efa 100644 --- a/graphics/ale/Makefile +++ b/graphics/ale/Makefile @@ -32,7 +32,7 @@ PLIST_FILES= bin/ale BROKEN= Does not build on alpha .endif -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 600000 +.if ${OSVERSION} < 600000 BROKEN= Does not build on 5.x due to internal gcc error .endif diff --git a/graphics/amanith/Makefile b/graphics/amanith/Makefile index b17a40ac2286..7bbf241bd940 100644 --- a/graphics/amanith/Makefile +++ b/graphics/amanith/Makefile @@ -40,10 +40,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -IGNORE= does not build on FreeBSD 4.x -.endif - .if ${OSVERSION} >= 700042 BROKEN= Broken with gcc 4.2 .endif diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile index 4bb9cce7aec3..535bf371d198 100644 --- a/graphics/cairomm/Makefile +++ b/graphics/cairomm/Makefile @@ -26,12 +26,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= Does not build -.endif - .if defined(NOPORTDOCS) CONFIGURE_ARGS+= --disable-docs @@ -42,4 +36,4 @@ post-configure: @${TOUCH} -f ${WRKSRC}/docs/reference/html/index.html .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile index e99f10a401fd..1367e6cc2de1 100644 --- a/graphics/corona/Makefile +++ b/graphics/corona/Makefile @@ -23,12 +23,6 @@ USE_GNOME= gnometarget lthack GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} <= 500000 -USE_GCC= 3.4+ -.endif - CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LIBS} -L${LOCALBASE}/lib" @@ -37,4 +31,4 @@ post-patch: 's|-Wall||' \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/crystalspace-devel/Makefile b/graphics/crystalspace-devel/Makefile index 18151c48049d..8cd98f9099d3 100644 --- a/graphics/crystalspace-devel/Makefile +++ b/graphics/crystalspace-devel/Makefile @@ -63,10 +63,6 @@ OPTIONS= DEBUG "Build with debugging information" off \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index 7046f14d2d7c..2ae09d9b6337 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -60,11 +60,4 @@ do-install: IGNORE= requires libGL from X.Org .endif -.if ${OSVERSION} < 500000 -pre-patch: - @${REINPLACE_CMD} -e 's|stdint.h|sys/types.h|g' \ - ${WRKSRC}/src/mesa/drivers/dri/mga/mga_xmesa.c \ - ${WRKSRC}/src/mesa/drivers/dri/mga/mgacontext.h -.endif - .include <bsd.port.post.mk> diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile index 3c96a4aa7b17..a6342bfdba7f 100644 --- a/graphics/edje/Makefile +++ b/graphics/edje/Makefile @@ -24,10 +24,6 @@ USE_LDCONFIG= yes .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -IGNORE= does not build on 4.X -.endif - .if ${ARCH} == "ia64" BROKEN= edje is broken on ia64 .endif diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile index ec57efcb339c..c3eeeff1fdf4 100644 --- a/graphics/exrtools/Makefile +++ b/graphics/exrtools/Makefile @@ -37,27 +37,10 @@ MAN1= exrblur.1 exrchr.1 exricamtm.1 exrnlm.1 exrnormalize.1 \ exrpptm.1 exrstats.1 exrtools.1 exrtopng.1 jpegtoexr.1 \ pngtoexr.1 ppmtoexr.1 -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -e 's|<values\.h>|<float.h>|' \ ${WRKSRC}/src/exrnormalize.c \ ${WRKSRC}/src/exrpptm.c \ ${WRKSRC}/src/exrstats.c -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e 's|stdint\.h|inttypes.h|' \ - ${WRKSRC}/src/exrblur.c \ - ${WRKSRC}/src/exrchr.c \ - ${WRKSRC}/src/exrnlm.c \ - ${WRKSRC}/src/exrnormalize.c \ - ${WRKSRC}/src/exrpptm.c \ - ${WRKSRC}/src/ppmtoexr.c \ - ${WRKSRC}/src/exricamtm.c \ - ${WRKSRC}/src/jpeginput.h \ - ${WRKSRC}/src/pngoutput.h \ - ${WRKSRC}/src/pnginput.h - @${REINPLACE_CMD} -e 's|inttypes\.h|sys/types.h|' \ - ${WRKSRC}/src/ppmtoexr.c -.endif - -.include <bsd.port.post.mk> + +.include <bsd.port.mk> diff --git a/graphics/geomorph/Makefile b/graphics/geomorph/Makefile index d57f9b12ef1b..fc95d80f32eb 100644 --- a/graphics/geomorph/Makefile +++ b/graphics/geomorph/Makefile @@ -24,12 +24,6 @@ GNU_CONFIGURE= yes PLIST_SUB= PORTVERSION=${PORTVERSION} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-* -.endif - post-patch: @${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/local/share/geomorph|${DATADIR}|' ${WRKSRC}/install-step* ${WRKSRC}/install-user ${WRKSRC}/src/app/app.c @@ -37,4 +31,4 @@ post-patch: @${REINPLACE_CMD} -e '/DEFAULT_DIR/ s|geomorph|.geomorph|' ${WRKSRC}/src/app/globals.h ${WRKSRC}/src/hf/globals.h @${RM} ${WRKSRC}/install-step*.bak ${WRKSRC}/install-user*.bak -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile index 8146c84f6eda..d03b9af101ea 100644 --- a/graphics/glitz/Makefile +++ b/graphics/glitz/Makefile @@ -23,12 +23,4 @@ USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ LDFLAGS="${PTHREAD_LIBS}" -.include <bsd.port.pre.mk> - -post-patch: -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \ - ${WRKSRC}/src/glitzint.h -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile index e9de42fd1c19..561c27ebc643 100644 --- a/graphics/gwenview-kde4/Makefile +++ b/graphics/gwenview-kde4/Makefile @@ -30,10 +30,4 @@ MAN1= gwenview.1 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} -.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/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index e9de42fd1c19..561c27ebc643 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -30,10 +30,4 @@ MAN1= gwenview.1 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} -.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/graphics/ida/Makefile b/graphics/ida/Makefile index a4d8434ca390..b43b57bd9827 100644 --- a/graphics/ida/Makefile +++ b/graphics/ida/Makefile @@ -33,14 +33,6 @@ PORTDOCS= README TODO INSTALL PLIST_FILES= bin/exiftran bin/ida lib/X11/app-defaults/Ida -.include <bsd.port.pre.mk> - -post-patch: -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e 's|PRId32|"d"|g' -e 's|PRIx32|"x"|g' \ - ${WRKSRC}/tiff.c ${WRKSRC}/xwd.c -.endif - post-install: ${INSTALL_PROGRAM} ${WRKSRC}/exiftran ${PREFIX}/bin .if !defined(NOPORTDOCS) @@ -50,4 +42,4 @@ post-install: .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile index 0ab5fd2c412d..7888e330e111 100644 --- a/graphics/inventor/Makefile +++ b/graphics/inventor/Makefile @@ -147,12 +147,6 @@ MAN3= SoAction.3iv SoCallbackAction.3iv SoGLRenderAction.3iv \ SoXtExaminerViewer.3iv SoXtFlyViewer.3iv SoXtFullViewer.3iv \ SoXtPlaneViewer.3iv SoXtViewer.3iv SoXtWalkViewer.3iv -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= "Does not compile" -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ;\ s|%%CXX%%|${CXX}|g ; \ @@ -160,4 +154,4 @@ post-patch: post-install: @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile index bb540de0edd8..dc73974ea80c 100644 --- a/graphics/kphotoalbum-kde4/Makefile +++ b/graphics/kphotoalbum-kde4/Makefile @@ -25,10 +25,4 @@ USE_AUTOTOOLS= libtool:15 post-patch: @${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/${CONFIGURE_SCRIPT} -.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/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index bb540de0edd8..dc73974ea80c 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -25,10 +25,4 @@ USE_AUTOTOOLS= libtool:15 post-patch: @${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/${CONFIGURE_SCRIPT} -.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/graphics/libpcd/Makefile b/graphics/libpcd/Makefile index d1cf1f71e957..102c7e0eabd2 100644 --- a/graphics/libpcd/Makefile +++ b/graphics/libpcd/Makefile @@ -19,11 +19,4 @@ INSTALLS_SHLIB= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} MAKEFILE= ${WRKSRC}/GNUmakefile -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -post-patch: - @${REINPLACE_CMD} -e 's/uint_fast16_t/uint32_t/' ${WRKSRC}/yuv2rgb.c -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/libsvg/Makefile b/graphics/libsvg/Makefile index 477fdab16cdb..8fa5055ad603 100644 --- a/graphics/libsvg/Makefile +++ b/graphics/libsvg/Makefile @@ -32,12 +32,4 @@ PLIST_FILES= include/svg.h \ lib/libsvg.so.1 \ libdata/pkgconfig/libsvg.pc -.include <bsd.port.pre.mk> - -post-patch: -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \ - ${WRKSRC}/src/svg_ascii.h -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/libx3dtk/Makefile b/graphics/libx3dtk/Makefile index d418e8417a1d..cb5e33842ecb 100644 --- a/graphics/libx3dtk/Makefile +++ b/graphics/libx3dtk/Makefile @@ -35,10 +35,6 @@ QMAKESPEC?= ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN=does not compile -.endif - .if ${ARCH} == "ia64" BROKEN= broken on ia64 .endif diff --git a/graphics/metacam/Makefile b/graphics/metacam/Makefile index c5edb953d448..ea0a55fbcf28 100644 --- a/graphics/metacam/Makefile +++ b/graphics/metacam/Makefile @@ -30,14 +30,6 @@ MAN1= metacam.1 ALL_TARGET= ${PORTNAME} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -post-patch: - @${REINPLACE_CMD} -e 's|<\(getopt\.h\)>|"\1"|' ${WRKSRC}/${PORTNAME}.cc - ${CP} ${FILESDIR}/getopt.h ${WRKSRC} -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 ${MANPREFIX}/man/man1 @@ -49,4 +41,4 @@ do-install: .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 60d62a7f0f1a..d42dc4b21872 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -52,11 +52,6 @@ DEVEL_PORTVERSION= 10.31 # -O causes an ICE in converter/other/exif.c with gcc 3.3.3 on sparc64. CFLAGS+= -O0 .endif -.if ${ARCH} == "alpha" -.if ${OSVERSION} < 500000 -CFLAGS+= -O0 -.endif -.endif .if defined(WITH_NETPBM_DEVEL) EXTRA_PATCHES+= ${FILESDIR}/editor-pnmquant-devel.patch diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile index ad10dd9bd9aa..667c22abee3c 100644 --- a/graphics/povray/Makefile +++ b/graphics/povray/Makefile @@ -63,10 +63,6 @@ CONFIGURE_ARGS= --x-includes="${X11BASE}/include" --includedir=${LOCALBASE} \ MAN1= povray.1 -.if ${OSVERSION} < 500000 -BROKEN= Does not build on 4.x -.endif - post-patch: #@${REINPLACE_CMD} -e 's+@PREFIX@+${PREFIX}+g;' ${WRKSRC}/povray.ini #@${REINPLACE_CMD} -e 's+%INSTALLDIR%+${PREFIX}/share/${PORTNAME}-${PORTVERSION}+g;' ${WRKSRC}/povray.conf diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile index ad10dd9bd9aa..667c22abee3c 100644 --- a/graphics/povray36/Makefile +++ b/graphics/povray36/Makefile @@ -63,10 +63,6 @@ CONFIGURE_ARGS= --x-includes="${X11BASE}/include" --includedir=${LOCALBASE} \ MAN1= povray.1 -.if ${OSVERSION} < 500000 -BROKEN= Does not build on 4.x -.endif - post-patch: #@${REINPLACE_CMD} -e 's+@PREFIX@+${PREFIX}+g;' ${WRKSRC}/povray.ini #@${REINPLACE_CMD} -e 's+%INSTALLDIR%+${PREFIX}/share/${PORTNAME}-${PORTVERSION}+g;' ${WRKSRC}/povray.conf diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile index ad10dd9bd9aa..667c22abee3c 100644 --- a/graphics/povray37/Makefile +++ b/graphics/povray37/Makefile @@ -63,10 +63,6 @@ CONFIGURE_ARGS= --x-includes="${X11BASE}/include" --includedir=${LOCALBASE} \ MAN1= povray.1 -.if ${OSVERSION} < 500000 -BROKEN= Does not build on 4.x -.endif - post-patch: #@${REINPLACE_CMD} -e 's+@PREFIX@+${PREFIX}+g;' ${WRKSRC}/povray.ini #@${REINPLACE_CMD} -e 's+%INSTALLDIR%+${PREFIX}/share/${PORTNAME}-${PORTVERSION}+g;' ${WRKSRC}/povray.conf diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index 7ffb7a42a885..4cd1bbabe2d2 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -29,15 +29,9 @@ CONFIGURE_ARGS= --without-pygtk CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LDFLAGS="-L${X11BASE}/lib" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -IGNORE= does not build on FreeBSD 4.x -.endif - post-patch: @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \ s|SUBDIRS = cairo examples test|SUBDIRS = cairo examples|' \ ${WRKSRC}/Makefile.in -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile index 2027a7472a1f..fe379fccf492 100644 --- a/graphics/raster3d/Makefile +++ b/graphics/raster3d/Makefile @@ -35,12 +35,6 @@ PLIST_SUB+= IMAGEMAGICK="@comment " MANL= avs2ps.l label3d.l r3d_objects.l rastep.l render.l rods.l \ balls.l normal3d.l r3dtops.l raster3d.l ribbon.l stereo3d.l -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -EXTRA_PATCHES= ${FILESDIR}/extrapatch-avs2ps.c ${FILESDIR}/extrapatch-in.h -.endif - pre-build: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} freebsd @@ -65,4 +59,4 @@ post-install: cd ${WRKSRC}/examples/msms && ${INSTALL_DATA} * ${EXAMPLESDIR}/msms .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/sharpconstruct/Makefile b/graphics/sharpconstruct/Makefile index c3c00cce5f31..e661847c5f95 100644 --- a/graphics/sharpconstruct/Makefile +++ b/graphics/sharpconstruct/Makefile @@ -29,12 +29,6 @@ MAN1= sharpconstruct.1 ONLY_FOR_ARCHS= i386 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on FreeBSD 4.x (lack of *round* functions) -.endif - post-patch: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/include/Align.hh @${REINPLACE_CMD} -e 's|"/sharpconstruct|"|' ${WRKSRC}/src/MainWindow.cc @@ -44,4 +38,4 @@ post-patch: @${FIND} ${WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e '/^DEFS / s|$$| -DDATADIR=\\"${DATADIR}\\"|' -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/swfmill/Makefile b/graphics/swfmill/Makefile index 6b84c964624a..11a8dd115b99 100644 --- a/graphics/swfmill/Makefile +++ b/graphics/swfmill/Makefile @@ -24,13 +24,7 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" PKG_CONFIG=${LOCALBASE}/bin/pkg-config USE_LDCONFIG= YES -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure -.if ${OSVERSION} < 500000 - ${REINPLACE_CMD} 's:#include.<stdint\.h>:#include <sys/types.h>:' \ - ${WRKSRC}/src/*.h -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/uDrawGraph/Makefile b/graphics/uDrawGraph/Makefile index df13ba70985c..4c5225b2ff41 100644 --- a/graphics/uDrawGraph/Makefile +++ b/graphics/uDrawGraph/Makefile @@ -15,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${PKGNUM}-${OPSYS:L}-${ARCH} MAINTAINER= nivit@FreeBSD.org COMMENT= A graph drawing/visualization system +LIB_DEPENDS= c.4:${PORTSDIR}/misc/compat4x + NO_BUILD= yes ONLY_FOR_ARCHS= i386 @@ -79,10 +81,4 @@ do-install: @${LN} ${LINK_OPTS} ${DOCSDIR} ${DATADIR}/docs .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500000 -LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/xnview/Makefile b/graphics/xnview/Makefile index 19d268585273..9c88ce418d3c 100644 --- a/graphics/xnview/Makefile +++ b/graphics/xnview/Makefile @@ -27,16 +27,6 @@ MLINKS= nview.1 nv.1 \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -PORTVERSION= 1.68 -PORTREVISION= 1 -DISTNAME= XnView-x86-unknown-FreeBSD4.x-static -WRKSRC= ${WRKDIR}/XnView-${PORTVERSION}-x86-unknown-FreeBSD4.x-static -PLIST_SUB+= FREEBSD4="" -.else -PLIST_SUB+= FREEBSD4="@comment " -.endif - .if ${OSVERSION} >= 600000 LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x .endif @@ -45,10 +35,6 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/xnview ${PREFIX}/bin/xnview ${INSTALL_PROGRAM} ${WRKSRC}/bin/nview ${PREFIX}/bin/nv ${INSTALL_PROGRAM} ${WRKSRC}/bin/nconvert ${PREFIX}/bin/nconvert -.if ${OSVERSION} < 500000 - ${INSTALL_PROGRAM} ${WRKSRC}/lib/libformat.so.4.16 ${PREFIX}/lib/libformat.so.4 - ${LN} -sf ${PREFIX}/lib/libformat.so.4 ${PREFIX}/lib/libformat.so -.endif ${INSTALL_DATA} ${WRKSRC}/app-defaults/XnView.ad ${PREFIX}/lib/X11/app-defaults/XnView cd ${WRKSRC}/man && ${INSTALL_MAN} xnview.1 nview.1 ${PREFIX}/man/man1 diff --git a/graphics/xnview/pkg-plist b/graphics/xnview/pkg-plist index b2bf0c1130b7..4023cd146830 100644 --- a/graphics/xnview/pkg-plist +++ b/graphics/xnview/pkg-plist @@ -2,8 +2,6 @@ bin/nconvert bin/nv bin/xnview lib/X11/app-defaults/XnView -%%FREEBSD4%%lib/libformat.so -%%FREEBSD4%%lib/libformat.so.4 %%PORTDOCS%%%%DOCSDIR%%/Formats.txt %%PORTDOCS%%%%DOCSDIR%%/ReadMe.txt %%PORTDOCS%%%%DOCSDIR%%/Usage.txt diff --git a/irc/ircd-ru/Makefile b/irc/ircd-ru/Makefile index 5c9d088d6367..38a4e206cdb1 100644 --- a/irc/ircd-ru/Makefile +++ b/irc/ircd-ru/Makefile @@ -94,8 +94,4 @@ post-install: @${CHOWN} -R ircd:ircd ${VARDIR}/log/ircd-ru @${CAT} ${PKGMESSAGE} -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - .include <bsd.port.post.mk> diff --git a/irc/ptlink-services/Makefile b/irc/ptlink-services/Makefile index 6766112615a8..e8fa01448b74 100644 --- a/irc/ptlink-services/Makefile +++ b/irc/ptlink-services/Makefile @@ -28,15 +28,9 @@ SYSCONFDIR= ${PREFIX}/etc/ptlink-services CONFIGURE_ARGS= --sysconfdir=${SYSCONFDIR} --localstatedir=/var \ --with-pidfile=/var/run/ircsvs.pid -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= Doesn't build on 4.x -.endif - post-install: @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CHOWN} -R ircd:ircd ${SYSCONFDIR} @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/irc/tr-ircd/Makefile b/irc/tr-ircd/Makefile index 7665a86bcd81..ee383e1efea0 100644 --- a/irc/tr-ircd/Makefile +++ b/irc/tr-ircd/Makefile @@ -72,10 +72,6 @@ SUB_LIST+= MKDIR="${MKDIR}" PW="${PW}" CHMOD="${CHMOD}" CHOWN="${CHOWN}" CFLAGS+= -fPIC .endif -.if ${OSVERSION} < 500000 -USE_GCC= 3.4 # Needs va_copy -.endif - post-patch: @${REINPLACE_CMD} -e "s,-O2,${CFLAGS}," ${WRKSRC}/configure @${REINPLACE_CMD} -e "s, ircpasswd,tr-ircpasswd," \ diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index d963e6335b01..76e79c911b96 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -80,10 +80,6 @@ PLIST_SUB+= TCL="@comment " .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= does not build on 4.X -.endif - .if defined(WITHOUT_PERL) CONFIGURE_ARGS+=--disable-perl PLIST_SUB+= PERL="@comment " diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile index 717d63ac4029..7ed914128243 100644 --- a/java/diablo-jdk15/Makefile +++ b/java/diablo-jdk15/Makefile @@ -50,7 +50,7 @@ LIB_DEPENDS= z.3:${PORTSDIR}/misc/compat6x JDK_OSREL= freebsd6 .elif ${OSVERSION} >= 600000 JDK_OSREL= freebsd6 -.elif ${OSVERSION} >= 500000 && ${ARCH} == "i386" +.elif ${ARCH} == "i386" JDK_OSREL= freebsd5 .else IGNORE= Only available for FreeBSD 5.x/i386 and FreeBSD 6.x/amd64 and later diff --git a/java/diablo-jre15/Makefile b/java/diablo-jre15/Makefile index 78f4687fa5a3..d82167aaf718 100644 --- a/java/diablo-jre15/Makefile +++ b/java/diablo-jre15/Makefile @@ -50,7 +50,7 @@ LIB_DEPENDS= z.3:${PORTSDIR}/misc/compat6x JRE_OSREL= freebsd6 .elif ${OSVERSION} >= 600000 JRE_OSREL= freebsd6 -.elif ${OSVERSION} >= 500000 && ${ARCH} == "i386" +.elif ${ARCH} == "i386" JRE_OSREL= freebsd5 .else IGNORE= Only available for FreeBSD 5.x/i386 and FreeBSD 6.x/amd64 and later diff --git a/java/ecj-bootstrap/Makefile b/java/ecj-bootstrap/Makefile index 0138ab8556bf..ad15e10f6374 100644 --- a/java/ecj-bootstrap/Makefile +++ b/java/ecj-bootstrap/Makefile @@ -29,8 +29,8 @@ ANT_VERSION= 1.6.5 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 || ${OSVERSION} > 700000 -IGNORE= dumps core on FreeBSD 4.x and 7.x +.if ${OSVERSION} > 700000 +IGNORE= dumps core on 7.x .endif GCJ= gcj41 diff --git a/java/jmp/Makefile b/java/jmp/Makefile index 52f6a62a2eb8..ac17e8bce6ce 100644 --- a/java/jmp/Makefile +++ b/java/jmp/Makefile @@ -61,8 +61,4 @@ CFLAGS+= -DJMPDEBUG -g CFLAGS+= -O3 .endif -.if ${OSVERSION} < 500000 -BROKEN= Does not build on FreeBSD < 5.x -.endif - .include <bsd.port.post.mk> diff --git a/java/netbeans3/Makefile b/java/netbeans3/Makefile index 9962b078c965..8566710de0a6 100644 --- a/java/netbeans3/Makefile +++ b/java/netbeans3/Makefile @@ -33,11 +33,9 @@ DOWNLOAD_URL?= http://www.netbeans.org/download/release36/promoted/FCS/release36 IGNORE= you must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again .endif -.if ${OSVERSION} >= 500000 post-patch: @${CAT} ${FILESDIR}/bin_runide.sh.diff | ${PATCH} ${WRKSRC}/bin/runide.sh @${RM} ${WRKSRC}/bin/runide.sh.orig -.endif do-install: @${MKDIR} ${PREFIX}/netbeans3 |