- Remove conditional checks for FreeBSD 5.x and older

Approved by:	pav
This commit is contained in:
Wesley Shields 2009-01-06 16:53:07 +00:00
parent 7d2247fbb1
commit 9168603ee2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=225331
25 changed files with 9 additions and 189 deletions

View file

@ -25,10 +25,6 @@ USE_RC_SUBR= abyssws.sh
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 600000
IGNORE= is for FreeBSD 6.x and newer
.endif
.if ${OSVERSION} >= 700043
LIB_DEPENDS+= c.6:${PORTSDIR}/misc/compat6x
.endif

View file

@ -139,7 +139,7 @@ CONFIGURE_ARGS+= --with-ldap \
.include "${APACHEDIR}/Makefile.modules"
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 600023 && ${OSVERSION} < 700014 && ${ARCH} == i386
.if ${OSVERSION} < 700014 && ${ARCH} == i386
BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
.endif
@ -149,12 +149,8 @@ IGNORE= : apr from ports (WITH_APR_FROM_PORTS) is no longer supported
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
. if ${OSVERSION} > 500023
. if ${ARCH} == i386
. if ${ARCH} == i386
CONFIGURE_ARGS+= --enable-nonportable-atomics
. endif
. else
CFLAGS+= -DFREEBSD_THREAD_HACK
. endif
.endif

View file

@ -167,10 +167,8 @@ CONFIGURE_ARGS+= --enable-v4-mapped
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
. if ${OSVERSION} > 500023
. if ${ARCH} == i386
. if ${ARCH} == i386
CONFIGURE_ARGS+= --enable-nonportable-atomics
. endif
. endif
.endif

View file

@ -230,10 +230,8 @@ libexec+= squid_kerb_auth
storage_schemes= ufs diskd null
.if defined(WITH_SQUID_AUFS)
storage_schemes+= aufs
.if ${OSVERSION}>=501000
# Only document libmap.conf where it is available:
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
.endif
# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
CONFIGURE_ARGS+= --with-pthreads
CFLAGS+= ${PTHREAD_CFLAGS}
@ -313,23 +311,10 @@ CONFIGURE_ARGS+= --enable-arp-acl
.endif
.if defined(WITH_SQUID_PF)
CONFIGURE_ARGS+= --enable-pf-transparent
.if ${OSVERSION} < 502106
IGNORE= pf available only in FreeBSD 5.3 and newer
.endif
.endif
# IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE,
# they were not installed on FreeBSD 5 from 2002-03-26 (OSVERSION > 500032) to
# 2003-06-27 (OSVERSION < 501101).
#
# Please see PR misc/44148 and the CVS log of src/include/Makefile for further
# information.
.if defined(WITH_SQUID_IPFILTER)
.if (${OSVERSION} > 500032 && ${OSVERSION} < 501101)
IGNORE= the IPFilter headers are not part of the base system
.else
CONFIGURE_ARGS+= --enable-ipf-transparent
.endif
.endif
.if defined(WITH_SQUID_FOLLOW_XFF)
CONFIGURE_ARGS+= --enable-follow-x-forwarded-for
.endif

View file

@ -232,10 +232,7 @@ libexec+= squid_kerb_auth
storage_schemes= ufs diskd null
.if defined(WITH_SQUID_AUFS)
storage_schemes+= aufs
.if ${OSVERSION}>=501000
# Only document libmap.conf where it is available:
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
.endif
# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
CONFIGURE_ARGS+= --with-pthreads
CFLAGS+= ${PTHREAD_CFLAGS}
@ -315,23 +312,10 @@ CONFIGURE_ARGS+= --enable-arp-acl
.endif
.if defined(WITH_SQUID_PF)
CONFIGURE_ARGS+= --enable-pf-transparent
.if ${OSVERSION} < 502106
IGNORE= pf available only in FreeBSD 5.3 and newer
.endif
.endif
# IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE,
# they were not installed on FreeBSD 5 from 2002-03-26 (OSVERSION > 500032) to
# 2003-06-27 (OSVERSION < 501101).
#
# Please see PR misc/44148 and the CVS log of src/include/Makefile for further
# information.
.if defined(WITH_SQUID_IPFILTER)
.if (${OSVERSION} > 500032 && ${OSVERSION} < 501101)
IGNORE= the IPFilter headers are not part of the base system
.else
CONFIGURE_ARGS+= --enable-ipf-transparent
.endif
.endif
.if defined(WITH_SQUID_FOLLOW_XFF)
CONFIGURE_ARGS+= --enable-follow-x-forwarded-for
.endif

View file

@ -232,10 +232,7 @@ libexec+= squid_kerb_auth
storage_schemes= ufs diskd null
.if defined(WITH_SQUID_AUFS)
storage_schemes+= aufs
.if ${OSVERSION}>=501000
# Only document libmap.conf where it is available:
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
.endif
# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
CONFIGURE_ARGS+= --with-pthreads
CFLAGS+= ${PTHREAD_CFLAGS}
@ -315,23 +312,10 @@ CONFIGURE_ARGS+= --enable-arp-acl
.endif
.if defined(WITH_SQUID_PF)
CONFIGURE_ARGS+= --enable-pf-transparent
.if ${OSVERSION} < 502106
IGNORE= pf available only in FreeBSD 5.3 and newer
.endif
.endif
# IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE,
# they were not installed on FreeBSD 5 from 2002-03-26 (OSVERSION > 500032) to
# 2003-06-27 (OSVERSION < 501101).
#
# Please see PR misc/44148 and the CVS log of src/include/Makefile for further
# information.
.if defined(WITH_SQUID_IPFILTER)
.if (${OSVERSION} > 500032 && ${OSVERSION} < 501101)
IGNORE= the IPFilter headers are not part of the base system
.else
CONFIGURE_ARGS+= --enable-ipf-transparent
.endif
.endif
.if defined(WITH_SQUID_FOLLOW_XFF)
CONFIGURE_ARGS+= --enable-follow-x-forwarded-for
.endif

View file

@ -63,9 +63,7 @@ MOZ_OPTIONS+= --disable-gnomeui
IGNORE= does not run, update to 6.2-RELEASE or newer
.endif
.if ${OSVERSION} >= 600000
MOZ_OPTIONS+= --enable-svg --enable-svg-renderer=cairo
.endif
post-extract::
@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \

View file

@ -63,9 +63,7 @@ MOZ_OPTIONS+= --disable-gnomeui
IGNORE= does not run, update to 6.2-RELEASE or newer
.endif
.if ${OSVERSION} >= 600000
MOZ_OPTIONS+= --enable-svg --enable-svg-renderer=cairo
.endif
post-extract::
@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \

View file

@ -63,9 +63,7 @@ MOZ_OPTIONS+= --disable-gnomeui
IGNORE= does not run, update to 6.2-RELEASE or newer
.endif
.if ${OSVERSION} >= 600000
MOZ_OPTIONS+= --enable-svg --enable-svg-renderer=cairo
.endif
post-extract::
@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \

View file

@ -63,9 +63,7 @@ BROKEN= does not compile
IGNORE= does not run, update to 6.2-RELEASE or newer
.endif
.if ${OSVERSION} >= 600000
MOZ_OPTIONS+= --enable-svg --enable-svg-renderer=cairo
.endif
post-extract::
@${SED} -e 's|@FLOCK_ICON@|${FLOCK_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \

View file

@ -44,44 +44,12 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
PLIST= ${WRKDIR}/pkg-plist
.endif
.if ${OSVERSION} >= 700001
LIBMAPCONF= ${EXAMPLESDIR}/libmap.conf-FreeBSD6
.elif ${OSVERSION} >= 600033 && ${OSVERSION} < 700000
LIBMAPCONF= ${EXAMPLESDIR}/libmap.conf-FreeBSD6
.elif ${OSVERSION} >= 503001
LIBMAPCONF= ${EXAMPLESDIR}/libmap.conf-FreeBSD5-stable
.else
LIBMAPCONF= ${EXAMPLESDIR}/libmap.conf-FreeBSD5-current
.endif
.if ${OSVERSION} < 501105
RTLD= /usr/libexec/ld-elf.so.1
.else
RTLD= /libexec/ld-elf.so.1
.endif
.if defined(WITH_DEBUG)
CFLAGS+= -DDEBUG=1
.endif
.if !defined(PACKAGE_BUILDING)
.if ${OSVERSION} < 501107
pre-everything::
@if ! strings ${RTLD} | ${GREP} libmap.conf > /dev/null 2>&1; then \
${ECHO_MSG} 'Please enable libmap.conf(5) feature for rtld(1).'; \
${ECHO_MSG} '4-stable user:'; \
${ECHO_MSG} ' You can get a following patch.'; \
${ECHO_MSG} ' http://people.FreeBSD.org/~nork/libmap_4stable.diff'; \
${ECHO_MSG} ' Please apply on /usr/src and make install on /usr/src/libexec/rtld-elf:'; \
${ECHO_MSG} ' # cd /usr/src ; patch -p0 < /tmp/libmap_4stable.diff'; \
${ECHO_MSG} ' # cd libexec/rtld-elf ; make clean all install'; \
${ECHO_MSG} '5.1-RELEASE user:'; \
${ECHO_MSG} ' Please see /usr/src/libexec/rtld-elf/Makefile.'; \
${FALSE}; \
fi
.endif
.endif
post-build:
@${SED} -e 's,%%PREFIX%%,${PREFIX},' \
-e 's,%%LOCALBASE%%,${LOCALBASE},' \

View file

@ -42,10 +42,8 @@ ONLY_FOR_ARCHS= i386 amd64
.if ${OSVERSION} >= 700000
OPERA_TYPE= 7
.elif ${OSVERSION} >= 600000
.else
OPERA_TYPE= 6
.else
IGNORE= is only supported on FreeBSD 6.x and higher
.endif
.if !defined(WITHOUT_ASPELL)

View file

@ -51,11 +51,7 @@ OPTIONS= ASPELL "Use the aspell library for spell checking" on
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 600000
ONLY_FOR_ARCHS= i386 amd64
.else
ONLY_FOR_ARCHS= i386
.endif
.if ${ARCH} == amd64
OPERA_ARCH= amd64
@ -65,12 +61,8 @@ OPERA_ARCH= intel
.if ${OSVERSION} >= 700000
OPERA_TYPE= 7
.elif ${OSVERSION} >= 600000
OPERA_TYPE= 6
.elif ${OSVERSION} >= 500000
OPERA_TYPE= 5
.else
IGNORE= is only supported on FreeBSD 5.x and higher
OPERA_TYPE= 6
.endif
.if !defined(WITHOUT_ASPELL)

View file

@ -4,9 +4,6 @@ SIZE (opera-9.63-freebsd6-shared-qt3.amd64.tar.bz2) = 7996409
MD5 (opera-9.63-freebsd7-shared-qt3.amd64.tar.bz2) = b7f23283c4e81e4257301b1c0199a31e
SHA256 (opera-9.63-freebsd7-shared-qt3.amd64.tar.bz2) = 566d9f255c889dd24d8f023abc1199a7d087d61fa1b8b637040f7fb3c9f5c423
SIZE (opera-9.63-freebsd7-shared-qt3.amd64.tar.bz2) = 7889803
MD5 (opera-9.63-freebsd5-shared-qt3.i386.tar.bz2) = a69a3661f1714c44f2ed88049fd29c92
SHA256 (opera-9.63-freebsd5-shared-qt3.i386.tar.bz2) = ce93c627c81e73baebff54c00abdeb683e9509684b0ef137bf88fa4024a321a5
SIZE (opera-9.63-freebsd5-shared-qt3.i386.tar.bz2) = 7490934
MD5 (opera-9.63-freebsd6-shared-qt3.i386.tar.bz2) = cca4ece9b44d72986887862ae8c7b661
SHA256 (opera-9.63-freebsd6-shared-qt3.i386.tar.bz2) = b1f037f010a28735e92c9735dae5295d562ff604a833836cae82199d73591023
SIZE (opera-9.63-freebsd6-shared-qt3.i386.tar.bz2) = 7493282

View file

@ -40,13 +40,7 @@ CONFIGURE_ARGS+=--without-http-curl-requests
.endif
.if defined(WITH_MAGIC_MIME)
. if ${OSVERSION} < 502128
LIB_DEPENDS+= magic.1:${PORTSDIR}/sysutils/file
MAGICBASE= ${LOCALBASE}
. else
MAGICBASE= /usr
. endif
CONFIGURE_ARGS+=--with-http-magic-mime=${MAGICBASE}
CONFIGURE_ARGS+=--with-http-magic-mime=/usr
.else
CONFIGURE_ARGS+=--without-http-magic-mime
.endif

View file

@ -60,10 +60,6 @@ MOZ_OPTIONS+= --enable-glitz
LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz
.endif
.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
IGNORE= core dumps on ${ARCH} during post-build
.endif
.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101
IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101
.endif

View file

@ -60,10 +60,6 @@ MOZ_OPTIONS+= --enable-glitz
LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz
.endif
.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
IGNORE= core dumps on ${ARCH} during post-build
.endif
.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101
IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101
.endif

View file

@ -253,7 +253,7 @@ libexec+= squid_kerb_auth
storage_schemes= ufs diskd null
.if defined(WITH_SQUID_AUFS)
storage_schemes+= aufs
.if ${OSVERSION}>=501000 && ${OSVERSION}<700055
.if ${OSVERSION}<700055
# Only document libmap.conf for releases where it may be needed to
# switch from libpthread (aka libkse) to libthr:
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-cf.data.pre.aufs

View file

@ -266,10 +266,8 @@ EXTRA_PATCHES+= ${PATCHDIR}/fix-kerberos.patch
storage_schemes= ufs diskd null
.if defined(WITH_SQUID_AUFS)
storage_schemes+= aufs
.if ${OSVERSION}>=501000
# Only document libmap.conf where it is available:
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
.endif
# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
CONFIGURE_ARGS+= --with-pthreads
CFLAGS+= ${PTHREAD_CFLAGS}
@ -349,23 +347,10 @@ CONFIGURE_ARGS+= --enable-arp-acl
.endif
.if defined(WITH_SQUID_PF)
CONFIGURE_ARGS+= --enable-pf-transparent
.if ${OSVERSION} < 502106
IGNORE= pf available only in FreeBSD 5.3 and newer
.endif
.endif
# IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE,
# they were not installed on FreeBSD 5 from 2002-03-26 (OSVERSION > 500032) to
# 2003-06-27 (OSVERSION < 501101).
#
# Please see PR misc/44148 and the CVS log of src/include/Makefile for further
# information.
.if defined(WITH_SQUID_IPFILTER)
.if (${OSVERSION} > 500032 && ${OSVERSION} < 501101)
IGNORE= the IPFilter headers are not part of the base system
.else
CONFIGURE_ARGS+= --enable-ipf-transparent
.endif
.endif
.if defined(WITH_SQUID_FOLLOW_XFF)
CONFIGURE_ARGS+= --enable-follow-x-forwarded-for
.endif

View file

@ -245,7 +245,7 @@ storage_schemes= ufs diskd null
storage_schemes+= aufs
# Only document switching from libpthread to libthr using libmap.conf
# where lipthread is the default threading library:
.if (${OSVERSION} >= 501000) && (${OSVERSION} < 700041)
.if ${OSVERSION} < 700041
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
.endif
# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
@ -324,23 +324,10 @@ CONFIGURE_ARGS+= --enable-ipfw-transparent
.endif
.if defined(WITH_SQUID_PF)
CONFIGURE_ARGS+= --enable-pf-transparent
.if ${OSVERSION} < 502106
IGNORE= pf available only in FreeBSD 5.3 and newer
.endif
.endif
# IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE,
# they were not installed on FreeBSD 5 from 2002-03-26 (OSVERSION > 500032) to
# 2003-06-27 (OSVERSION < 501101).
#
# Please see PR misc/44148 and the CVS log of src/include/Makefile for further
# information.
.if defined(WITH_SQUID_IPFILTER)
.if (${OSVERSION} > 500032 && ${OSVERSION} < 501101)
IGNORE= the IPFilter headers are not part of the base system
.else
CONFIGURE_ARGS+= --enable-ipf-transparent
.endif
.endif
.if defined(WITH_SQUID_ICAP)
CONFIGURE_ARGS+= --enable-icap-client
.endif

View file

@ -245,7 +245,7 @@ storage_schemes= ufs diskd null
storage_schemes+= aufs
# Only document switching from libpthread to libthr using libmap.conf
# where lipthread is the default threading library:
.if (${OSVERSION} >= 501000) && (${OSVERSION} < 700041)
.if ${OSVERSION} < 700041
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
.endif
# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
@ -324,23 +324,10 @@ CONFIGURE_ARGS+= --enable-ipfw-transparent
.endif
.if defined(WITH_SQUID_PF)
CONFIGURE_ARGS+= --enable-pf-transparent
.if ${OSVERSION} < 502106
IGNORE= pf available only in FreeBSD 5.3 and newer
.endif
.endif
# IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE,
# they were not installed on FreeBSD 5 from 2002-03-26 (OSVERSION > 500032) to
# 2003-06-27 (OSVERSION < 501101).
#
# Please see PR misc/44148 and the CVS log of src/include/Makefile for further
# information.
.if defined(WITH_SQUID_IPFILTER)
.if (${OSVERSION} > 500032 && ${OSVERSION} < 501101)
IGNORE= the IPFilter headers are not part of the base system
.else
CONFIGURE_ARGS+= --enable-ipf-transparent
.endif
.endif
.if defined(WITH_SQUID_ICAP)
CONFIGURE_ARGS+= --enable-icap-client
.endif

View file

@ -40,10 +40,8 @@ post-patch:
${MV} ${WRKSRC}/extras/htpasswd.1 ${WRKSRC}/extras/thttpdpasswd.1
${MV} ${WRKSRC}/extras/htpasswd.c ${WRKSRC}/extras/thttpdpasswd.c
.if ${OSVERSION} > 502101
post-configure:
@cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-config.h
.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/thttpd ${PREFIX}/sbin

View file

@ -91,17 +91,12 @@ CONFIGURE_ARGS+= --enable-keymap=lynx
.endif
.if defined(WITH_THREADING)
.if ${OSVERSION} < 502102
CONFIGURE_ENV= DEFS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="${LIBS} ${PTHREAD_LIBS:C/-pthread/-lc_r/}"
.else
# Use -lpthread instead of ${PTHREAD_LIBS} to link libpthread
# and libc before libgc.
# This is necessary to avoid build error with boehm-gc with REDIRECT and
# THREADING options.
CONFIGURE_ENV= DEFS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="${LIBS} ${PTHREAD_LIBS:C/-pthread/-lpthread/} -lc"
.endif
.else
CONFIGURE_ENV= DEFS="-I${LOCALBASE}/include"
.endif

View file

@ -39,10 +39,6 @@ MAKEFILE= GNUmakefile
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 600000
IGNORE= Does not build
.endif
.if ${ARCH} == "sparc64"
BROKEN= Does not compile on sparc64
.endif

View file

@ -39,10 +39,6 @@ ISOFILES= Setup.pl Admin/ManageTemplates.pl Languages/English/Admin.lng \
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 600021 && ( ${OSVERSION} < 504102 || ${OSVERSION} > 599999 )
RUN_DEPENDS+= sha256:${PORTSDIR}/sysutils/freebsd-sha256
.endif
post-extract:
@${RM} -rf ${WCGI}/Convert ${WCGI}/Modules ${WCGI}/FixFile.pl
@${CHMOD} -R a=,u+rwX ${WCGI}/*