From 7b4ee14e1fc34f0768f24115ada4f2d23bd35e75 Mon Sep 17 00:00:00 2001 From: Wesley Shields Date: Tue, 6 Jan 2009 17:43:44 +0000 Subject: - Remove conditional checks for FreeBSD 5.x and older Approved by: pav --- textproc/clucene/Makefile | 4 ---- textproc/domc/Makefile | 8 +------- textproc/gxditview/Makefile | 8 +------- textproc/heirloom-doctools/Makefile | 4 ---- textproc/highlight/Makefile | 4 ---- textproc/iiimf-client-lib/Makefile | 4 ---- textproc/iiimf-csconv/Makefile | 4 ---- textproc/iiimf-gnome-im-switcher/Makefile | 4 ---- textproc/iiimf-gtk/Makefile | 4 ---- textproc/iiimf-le-unit/Makefile | 4 ---- textproc/iiimf-protocol-lib/Makefile | 4 ---- textproc/iiimf-server/Makefile | 4 ---- textproc/iiimf-x-lib/Makefile | 4 ---- textproc/iiimf-x/Makefile | 4 ---- textproc/latte/Makefile | 5 +---- textproc/msort/Makefile | 8 +------- textproc/nicetext/Makefile | 5 +---- textproc/p5-XML-DOM/Makefile | 9 +-------- textproc/py-rdflib/Makefile | 8 +------- textproc/rast/Makefile | 5 ----- textproc/skim/Makefile | 15 ++++----------- 21 files changed, 11 insertions(+), 108 deletions(-) (limited to 'textproc') diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile index c2339b0b6fef..9c8fea8f31a5 100644 --- a/textproc/clucene/Makefile +++ b/textproc/clucene/Makefile @@ -26,8 +26,4 @@ USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS+= --enable-ascii .endif -.if ${OSVERSION} < 500016 -CONFIGURE_ENV+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} -.endif - .include diff --git a/textproc/domc/Makefile b/textproc/domc/Makefile index fdac26942df9..a20ad3792066 100644 --- a/textproc/domc/Makefile +++ b/textproc/domc/Makefile @@ -33,10 +33,4 @@ USE_LDCONFIG= yes PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" -.include - -.if ${OSVERSION} < 500039 -IGNORE= requires wchar functions to use the produced library -.endif - -.include +.include diff --git a/textproc/gxditview/Makefile b/textproc/gxditview/Makefile index 8973230cabe2..7812b72254e0 100644 --- a/textproc/gxditview/Makefile +++ b/textproc/gxditview/Makefile @@ -44,10 +44,4 @@ do-extract: ${CP} -rp /usr/src/contrib/groff/src/xditview/* ${WRKSRC} .endif -.include - -.if ${OSVERSION} <= 600000 -BROKEN= Missing dependency on imake -.endif - -.include +.include diff --git a/textproc/heirloom-doctools/Makefile b/textproc/heirloom-doctools/Makefile index b52cf7566d53..94dfa1e00f2a 100644 --- a/textproc/heirloom-doctools/Makefile +++ b/textproc/heirloom-doctools/Makefile @@ -54,10 +54,6 @@ PORTDOCS= CHANGES README LICENSE .include -.if ${OSVERSION} < 600000 -BROKEN= fails to install on FreeBSD 5.x -.endif - post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile index 733a0af7cb4a..2d373e0ca74a 100644 --- a/textproc/highlight/Makefile +++ b/textproc/highlight/Makefile @@ -33,10 +33,6 @@ PORTDOCS= ChangeLog INSTALL README README_DE README_INDENT \ .include -.if ${OSVERSION} < 600000 -BROKEN= does not compile -.endif - post-patch: @${REINPLACE_CMD} -e \ 's|^PREFIX =|PREFIX ?=|' ${WRKSRC}/${MAKEFILE} diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile index 34952b751fd5..3627d20aca77 100644 --- a/textproc/iiimf-client-lib/Makefile +++ b/textproc/iiimf-client-lib/Makefile @@ -31,10 +31,6 @@ BUILDDIR= ${WRKSRC}/lib/iiimcf .include -.if ${OSVERSION} < 503000 -IGNORE= is supported on FreeBSD 5.3 and later only -.endif - CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile index 8913466c8ec4..2c944a4c97d9 100644 --- a/textproc/iiimf-csconv/Makefile +++ b/textproc/iiimf-csconv/Makefile @@ -29,10 +29,6 @@ BUILDDIR= ${WRKSRC}/lib/CSConv .include -.if ${OSVERSION} < 503000 -IGNORE= is supported on FreeBSD 5.3 and later only -.endif - CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS} CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile index be26d1d08eff..9135fae73130 100644 --- a/textproc/iiimf-gnome-im-switcher/Makefile +++ b/textproc/iiimf-gnome-im-switcher/Makefile @@ -34,10 +34,6 @@ BUILDDIR= ${WRKSRC}/gnome-im-switcher .include -.if ${OSVERSION} < 503000 -IGNORE= is supported on FreeBSD 5.3 and later only -.endif - CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lintl ${PTHREAD_LIBS} CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile index b56712ab0cdd..2f1a71ce9456 100644 --- a/textproc/iiimf-gtk/Makefile +++ b/textproc/iiimf-gtk/Makefile @@ -33,10 +33,6 @@ BUILDDIR= ${WRKSRC}/iiimgcf .include -.if ${OSVERSION} < 503000 -IGNORE= is supported on FreeBSD 5.3 and later only -.endif - .if defined(WITH_DEBUG) CFLAGS+= -DDEBUG .endif diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile index f6dd14a2d943..12656f594408 100644 --- a/textproc/iiimf-le-unit/Makefile +++ b/textproc/iiimf-le-unit/Makefile @@ -34,10 +34,6 @@ BUILDDIR= ${WRKSRC}/leif .include -.if ${OSVERSION} < 503000 -IGNORE= is supported on FreeBSD 5.3 and later only -.endif - CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv ${PTHREAD_LIBS} CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile index 30d1797fb8ec..c20aaa1d2289 100644 --- a/textproc/iiimf-protocol-lib/Makefile +++ b/textproc/iiimf-protocol-lib/Makefile @@ -28,10 +28,6 @@ BUILDDIR= ${WRKSRC}/lib/iiimp .include -.if ${OSVERSION} < 503000 -IGNORE= is supported on FreeBSD 5.3 and later only -.endif - CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" post-patch: diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile index ea5144b395ef..52076de9ff9a 100644 --- a/textproc/iiimf-server/Makefile +++ b/textproc/iiimf-server/Makefile @@ -33,10 +33,6 @@ BUILDDIR= ${WRKSRC}/iiimsf .include -.if ${OSVERSION} < 503000 -IGNORE= is supported on FreeBSD 5.3 and later only -.endif - .if defined(WITH_DEBUG) CFLAGS+= -g -ggdb -DDEBUG .endif diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile index 761f7f22e402..aa58fdb9414f 100644 --- a/textproc/iiimf-x-lib/Makefile +++ b/textproc/iiimf-x-lib/Makefile @@ -34,10 +34,6 @@ BUILDDIR= ${WRKSRC}/iiimxcf/xiiimp.so .include -.if ${OSVERSION} < 503000 -IGNORE= is supported on FreeBSD 5.3 and later only -.endif - CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS} CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile index 57b88741aa6a..b27e25b05e5f 100644 --- a/textproc/iiimf-x/Makefile +++ b/textproc/iiimf-x/Makefile @@ -32,10 +32,6 @@ BUILDDIR= ${WRKSRC}/iiimxcf/htt_xbe .include -.if ${OSVERSION} < 503000 -IGNORE= is supported on FreeBSD 5.3 and later only -.endif - CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} CXXFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} diff --git a/textproc/latte/Makefile b/textproc/latte/Makefile index d807e5262549..59bfa8a94aae 100644 --- a/textproc/latte/Makefile +++ b/textproc/latte/Makefile @@ -22,6 +22,7 @@ CONFIGURE_ARGS= --enable-shared MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" USE_LDCONFIG= yes +USE_GCC= 3.3 INFO= latte liblatte @@ -30,10 +31,6 @@ LDFLAGS= -L${LOCALBASE}/lib .include -.if ${OSVERSION} >= 502126 -USE_GCC= 3.3 -.endif - post-extract: -@${RM} ${WRKSRC}/getopt* diff --git a/textproc/msort/Makefile b/textproc/msort/Makefile index 525000592e7f..1e742349fea3 100644 --- a/textproc/msort/Makefile +++ b/textproc/msort/Makefile @@ -29,10 +29,4 @@ PLIST_FILES= bin/msg bin/msort MAN1= msort.1 -.include - -.if ${OSVERSION} < 500035 -BROKEN= Does not build with older versions of FreeBSD -.endif - -.include +.include diff --git a/textproc/nicetext/Makefile b/textproc/nicetext/Makefile index 01cb9ae29202..fd7bbb89d1ea 100644 --- a/textproc/nicetext/Makefile +++ b/textproc/nicetext/Makefile @@ -19,6 +19,7 @@ MASTER_SITES= http://www.mirrors.wiretapped.net/security/steganography/nicetext/ MAINTAINER= ports@FreeBSD.org COMMENT= Convert files to pseudo-natural-language text and back again +USE_GCC= 3.3 USE_GMAKE= yes CFLAGS+= -fpermissive @@ -31,10 +32,6 @@ PROGRAMS= bitcp dct2mstr expgram genmodel gramtest impkimmo impmsc \ .include -.if ${OSVERSION} >= 502126 -USE_GCC= 3.3 -.endif - post-patch: @${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \ 's|gcc|$${CC}|g ; \ diff --git a/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile index ca25bb219f73..8b50a89b9ac2 100644 --- a/textproc/p5-XML-DOM/Makefile +++ b/textproc/p5-XML-DOM/Makefile @@ -37,11 +37,4 @@ MAN3= XML::DOM.3 XML::DOM::AttDef.3 XML::DOM::AttlistDecl.3 \ PBASE= ${SITE_PERL} -.include - -.if ${OSVERSION} < 500007 -post-patch: - @${PERL} -i -pe 's/^ *use bytes;.*//;' ${WRKSRC}/lib/XML/DOM.pm -.endif - -.include +.include diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile index ab919ce2a0b6..29dff7784772 100644 --- a/textproc/py-rdflib/Makefile +++ b/textproc/py-rdflib/Makefile @@ -25,10 +25,4 @@ pre-build: @cd ${WRKSRC} && ${PYTHON_CMD} setup.py setopt -c bdist_egg -o plat-name -s ${PYEASYINSTALL_OSARCH:S/^-//} @cd ${WRKSRC} && ${PYTHON_CMD} setup.py setopt -c bdist -o plat-name -s ${PYEASYINSTALL_OSARCH:S/^-//} -.include - -.if ${OSVERSION} < 600000 -BROKEN= Leaves egg file behind on deinstall -.endif - -.include +.include diff --git a/textproc/rast/Makefile b/textproc/rast/Makefile index 8974b96615ec..6823ebe18673 100644 --- a/textproc/rast/Makefile +++ b/textproc/rast/Makefile @@ -69,11 +69,6 @@ PLIST_SUB+= WITH_XMLRPC_C="@comment " .include -# For 4.x systems. -.if ${OSVERSION} <= 503000 -BUILD_DEPENDS+= ${LOCALBASE}/include/magic.h:${PORTSDIR}/sysutils/file -.endif - DEFAULT_ENCODING?= euc_jp .include diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile index 5ef144259991..b88ea663fb7a 100644 --- a/textproc/skim/Makefile +++ b/textproc/skim/Makefile @@ -27,19 +27,12 @@ PYDISTUTILS_NOEGGINFO= yes CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ - PREFIX="${PREFIX}" + PREFIX="${PREFIX}" \ + CXXFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__ ${CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib -lintl" -.include -.if ${OSVERSION} < 500035 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -CONFIGURE_ENV+= CXXFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/stlport ${CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc -lintl ${PTHREAD_LIBS}" -.else -CONFIGURE_ENV+= CXXFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__ ${CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" -.endif +.include post-patch: ${REINPLACE_CMD} s,bash,sh,g ${WRKSRC}/src/scim-panel-kde.in -- cgit v1.2.3