From b448c924112a2914f0569c0bcec9690b9fa159cd Mon Sep 17 00:00:00 2001 From: Edwin Groothuis Date: Thu, 4 Oct 2007 06:21:46 +0000 Subject: Remove always-false/true conditions based on OSVERSION 500000 --- www/campsite/Makefile | 8 +------- www/dfileserver/Makefile | 8 +------- www/dtse/Makefile | 4 ---- www/firefox-esr/Makefile | 4 ---- www/firefox/Makefile | 4 ---- www/firefox36/Makefile | 4 ---- www/galeon/Makefile | 3 +-- www/junkbuster/Makefile | 8 +------- www/kazehakase/Makefile | 4 ---- www/opera/Makefile | 6 ++---- www/pecl-pecl_http/Makefile | 2 +- www/polipo/Makefile | 4 ---- www/seamonkey/Makefile | 5 ----- www/seamonkey2/Makefile | 5 ----- www/tinyproxy/Makefile | 7 +------ www/wwwoffle/Makefile | 8 +------- www/xulrunner/Makefile | 5 ----- 17 files changed, 9 insertions(+), 80 deletions(-) (limited to 'www') diff --git a/www/campsite/Makefile b/www/campsite/Makefile index 5ec840fe5936..bb7125f1e3d8 100644 --- a/www/campsite/Makefile +++ b/www/campsite/Makefile @@ -43,12 +43,6 @@ USE_GMAKE= yes SUB_FILES= pkg-message pkg-install pkg-deinstall crontab.in -.include - -.if ${OSVERSION} < 500000 -BROKEN= does not compile -.endif - post-patch: @${FIND} ${WRKSRC} -type f -perm 755 \ -or -name campsite_create_instance \ @@ -69,4 +63,4 @@ post-install: @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} -.include +.include diff --git a/www/dfileserver/Makefile b/www/dfileserver/Makefile index fe408dcdc229..581a4c114f30 100644 --- a/www/dfileserver/Makefile +++ b/www/dfileserver/Makefile @@ -19,12 +19,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} MAKE_ENV= CXX=${CXX} -.include - -.if ${OSVERSION} < 500000 -USE_GCC= 3.4+ -.endif - post-patch: ${REINPLACE_CMD} 's,g++,${CXX},;s,$$GCCFLAGS,${CXXFLAGS},; \ s,strip,${STRIP_CMD},' ${WRKSRC}/build.sh @@ -36,4 +30,4 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/DFileServer.x86 ${PREFIX}/bin/dfileserver -.include +.include diff --git a/www/dtse/Makefile b/www/dtse/Makefile index 547f6a38f3a1..d7c8c971f1d6 100644 --- a/www/dtse/Makefile +++ b/www/dtse/Makefile @@ -32,10 +32,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include -.if ${OSVERSION} < 500000 -USE_GCC= 3.4 -.endif - .if ${PERL_LEVEL} < 500800 BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp .endif diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 84823e17d917..3e48e4eeb15a 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -52,10 +52,6 @@ OPTIONS= NEWTAB "Open external links in a new tab" on \ GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} -.if ${OSVERSION} < 500000 -BROKEN= does not build -.endif - .if ${ARCH} == "sparc64" && ${OSVERSION} < 601101 IGNORE= does not run, update to 6.2-RELEASE or newer .endif diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 84823e17d917..3e48e4eeb15a 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -52,10 +52,6 @@ OPTIONS= NEWTAB "Open external links in a new tab" on \ GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} -.if ${OSVERSION} < 500000 -BROKEN= does not build -.endif - .if ${ARCH} == "sparc64" && ${OSVERSION} < 601101 IGNORE= does not run, update to 6.2-RELEASE or newer .endif diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index 84823e17d917..3e48e4eeb15a 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -52,10 +52,6 @@ OPTIONS= NEWTAB "Open external links in a new tab" on \ GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} -.if ${OSVERSION} < 500000 -BROKEN= does not build -.endif - .if ${ARCH} == "sparc64" && ${OSVERSION} < 601101 IGNORE= does not run, update to 6.2-RELEASE or newer .endif diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 2b8e9f3f13eb..31b77a68cec4 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -38,11 +38,10 @@ GCONF_SCHEMAS= galeon.schemas .include .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" -.if ${OSVERSION} > 500000 # Galeon does not build correctly in -CURRENT if -Werror is passed # to the compiler. NO_WERROR= yes -.endif + # allow build with more warnings enabled .if defined(NO_WERROR) CONFIGURE_ARGS+= --disable-werror diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile index e15d2aeca6f5..41b454899e9f 100644 --- a/www/junkbuster/Makefile +++ b/www/junkbuster/Makefile @@ -23,13 +23,7 @@ SUB_FILES= junkbuster.sh pkg-message USE_RC_SUBR= yes PKGMESSAGE= ${WRKDIR}/pkg-message -.include - -.if ( ${OSVERSION} >= 500000 ) GNUREGEXP= 's:gnu_regex.h:gnu/regex.h:' -.else -GNUREGEXP= 's:gnu_regex.h:gnuregex.h:' -.endif post-patch: .for f in junkbstr.ini saclfile.ini sblock.ini scookie.ini sforward.ini strust.ini win32.h @@ -56,4 +50,4 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include +.include diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile index 827e344d503c..b5040d2737b0 100644 --- a/www/kazehakase/Makefile +++ b/www/kazehakase/Makefile @@ -39,10 +39,6 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv .include .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" -.if ${OSVERSION} < 500000 -IGNORE=Does not build -.endif - # !!! gtk-webcore higly experimental right now and not very stable !!! # See https://mail.gna.org/public/kazehakase-devel/2004-10/msg00001.html # on how to use gtk-webcore with kazehakase. and yes you still have to diff --git a/www/opera/Makefile b/www/opera/Makefile index 18013c2309da..066969110a5f 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -61,10 +61,8 @@ QT_PRESENT= off OPERA_TYPE= 1 .elif ${OSVERSION} >= 600000 OPERA_TYPE= 4 -.elif ${OSVERSION} >= 500000 -OPERA_TYPE= 3 .else -OPERA_TYPE= 1 +OPERA_TYPE= 3 .endif .if ${OSVERSION} > 700000 @@ -86,7 +84,7 @@ OPERA_LIB= static OPERA_TYPE= 1 .endif -.if ${OPERA_TYPE} == 1 && ${OSVERSION} >= 500000 +.if ${OPERA_TYPE} == 1 LIB_DEPENDS+= c_r.4:${PORTSDIR}/misc/compat4x .if ${OSVERSION} >= 600000 LIB_DEPENDS+= z.2:${PORTSDIR}/misc/compat5x diff --git a/www/pecl-pecl_http/Makefile b/www/pecl-pecl_http/Makefile index 7851372564cf..ea96e1c99001 100644 --- a/www/pecl-pecl_http/Makefile +++ b/www/pecl-pecl_http/Makefile @@ -50,7 +50,7 @@ CONFIGURE_ARGS+=--with-http-magic-mime=${MAGICBASE} CONFIGURE_ARGS+=--without-http-magic-mime .endif -.if defined(WITH_ZLIB_COMPRESSION) && ${OSVERSION} > 500000 +.if defined(WITH_ZLIB_COMPRESSION) CONFIGURE_ARGS+=--with-http-zlib-compression=/usr .else CONFIGURE_ARGS+=--without-http-zlib-compression diff --git a/www/polipo/Makefile b/www/polipo/Makefile index 524fea0b0faa..89b05c028c51 100644 --- a/www/polipo/Makefile +++ b/www/polipo/Makefile @@ -20,10 +20,6 @@ USE_RC_SUBR= polipo.sh .include -# in some 4.x makeinfo does not work. So we do not try to build and install. -.if ${OSVERSION} < 500000 -NO_PTEXINFO= yes -.endif .if defined(NO_PTEXINFO) ALL_TARGET= polipo NOPORTDOCS= yes diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index b3541f1ff248..dcfc7bb86f25 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -62,11 +62,6 @@ IGNORE= core dumps on ${ARCH} during post-build IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101 .endif -.if ${OSVERSION} < 500000 -USE_GCC= 3.4 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-security_manager_Makefile.in -.endif - .if defined(WITHOUT_MAILNEWS) MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index b3541f1ff248..dcfc7bb86f25 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -62,11 +62,6 @@ IGNORE= core dumps on ${ARCH} during post-build IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101 .endif -.if ${OSVERSION} < 500000 -USE_GCC= 3.4 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-security_manager_Makefile.in -.endif - .if defined(WITHOUT_MAILNEWS) MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile index ce4312d85fbb..592593907ee4 100644 --- a/www/tinyproxy/Makefile +++ b/www/tinyproxy/Makefile @@ -24,15 +24,10 @@ CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \ MAN8= tinyproxy.8 -.include - post-patch: @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc/tinyproxy/tinyproxy.conf|${PREFIX}/etc/tinyproxy.conf|' \ ${WRKSRC}/doc/tinyproxy.8 -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e 's|stdint.h|stdlib.h|' ${WRKSRC}/src/scanner.c -.endif post-install: @if [ ! -f ${PREFIX}/etc/tinyproxy.conf ]; then \ @@ -40,4 +35,4 @@ post-install: ${PREFIX}/etc/tinyproxy.conf ; \ fi -.include +.include diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile index 2f49b3923f9f..3ab54cc7ad6c 100644 --- a/www/wwwoffle/Makefile +++ b/www/wwwoffle/Makefile @@ -39,12 +39,6 @@ MAN1= wwwoffle.1 MAN5= wwwoffle.conf.5 MAN8= wwwoffled.8 -.include - -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - .if ${WWWOFFLE_SPOOL} != "/var/spool/wwwoffle" # If using a non-standard spool, change all the documentation (and anything # else) to reflect that. @@ -60,4 +54,4 @@ post-install: @${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config.pl ${WWWOFFLE_SPOOL} @${CAT} ${PKGMESSAGE} -.include +.include diff --git a/www/xulrunner/Makefile b/www/xulrunner/Makefile index 1ec16436be1b..bd2d708ebaac 100644 --- a/www/xulrunner/Makefile +++ b/www/xulrunner/Makefile @@ -33,9 +33,4 @@ USE_GECKO_OPTIONS= java debug logging optimized_cflags .include .include "${PORTSDIR}/www/mozilla/Makefile.common" - -.if ${OSVERSION} < 500000 -BROKEN= does not build -.endif - .include -- cgit v1.2.3