diff options
author | Edwin Groothuis <edwin@FreeBSD.org> | 2007-10-04 00:24:54 +0000 |
---|---|---|
committer | Edwin Groothuis <edwin@FreeBSD.org> | 2007-10-04 00:24:54 +0000 |
commit | e74f1f2ba2a728af887a83b377b13746054b76e5 (patch) | |
tree | 9e8d0df9fa6e67d5a64401e5b706db886bfc98aa /deskutils | |
parent | 9f89962a6d493602e7eca1e2fdbf365561f1e99f (diff) | |
download | ports-e74f1f2ba2a728af887a83b377b13746054b76e5.tar.gz ports-e74f1f2ba2a728af887a83b377b13746054b76e5.zip |
Remove always-false/true conditions based on OSVERSION 500000
Notes
Notes:
svn path=/head/; revision=200769
Diffstat (limited to 'deskutils')
-rw-r--r-- | deskutils/adesklets/Makefile | 10 | ||||
-rw-r--r-- | deskutils/buoh/Makefile | 8 | ||||
-rw-r--r-- | deskutils/calcurse/Makefile | 8 | ||||
-rw-r--r-- | deskutils/katapult/Makefile | 8 | ||||
-rw-r--r-- | deskutils/kchm/Makefile | 8 | ||||
-rw-r--r-- | deskutils/kdissert/Makefile | 4 | ||||
-rw-r--r-- | deskutils/lightning-xpi/Makefile | 4 | ||||
-rw-r--r-- | deskutils/nautilus-locked-folder/Makefile | 7 | ||||
-rw-r--r-- | deskutils/pal/Makefile | 2 | ||||
-rw-r--r-- | deskutils/semantik/Makefile | 4 |
10 files changed, 9 insertions, 54 deletions
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 ; \ |