Date: Thu, 18 Oct 2001 19:50:02 -0700 (PDT) From: "Scot W. Hetzel" <hetzels@westbend.net> To: freebsd-ports@FreeBSD.org Subject: Re: ports/31361: Upgrade to Apache 1.3.22 + misc fixes Message-ID: <200110190250.f9J2o2F50107@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/31361; it has been noted by GNATS.
From: "Scot W. Hetzel" <hetzels@westbend.net>
To: "FreeBSD-GNATS" <FreeBSD-gnats-submit@freebsd.org>
Cc: "Cyrille Lefevre" <clefevre@citeweb.net>
Subject: Re: ports/31361: Upgrade to Apache 1.3.22 + misc fixes
Date: Thu, 18 Oct 2001 21:20:24 -0500
> From: Cyrille Lefevre <clefevre@citeweb.net>
> Scot W. Hetzel wrote:
> >
> > >Number: 31361
> > >Category: ports
> > >Synopsis: Upgrade to Apache 1.3.22 + misc fixes
> [snip]
> > -.if ${OSVERSION} < 500016
> > +.if ${OSVERSION} < 4300001 || ( ${OSVERSION} > 499999 && ${OSVERSION} < 500014 )
>
> IMHO, >= 500000 is more readable than > 499999.
>
Thanks for the hint, below is an additional patch to the Makefile with this change
and corrects an error in the last OSVERSION check (missing '|').
Scot
--- Makefile.orig Thu Oct 18 14:09:35 2001
+++ Makefile Thu Oct 18 21:22:20 2001
@@ -47,7 +47,7 @@
.ifdef WANT_BSDI_EXT
FRONTPAGE= fp40.bsdi.tar.Z
EXTRA_PATCHES= ${FILESDIR}/change_server.bsdi ${FILESDIR}/fp_install.bsdi
-.if ${OSVERSION} < 4300001 || ( ${OSVERSION} > 499999 && ${OSVERSION} < 500014 )
+.if ${OSVERSION} < 4300001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500014 )
PKGMESSAGE= pkg-message.bsdi
.endif
.else
@@ -55,7 +55,7 @@
LIB_DEPENDS+= c.3:${PORTSDIR}/misc/compat3x
.endif
FRONTPAGE= fp40.freebsd.tar.Z
-.if ${OSVERSION} < 4300001 || ( ${OSVERSION} > 499999 && ${OSVERSION} < 500014 )
+.if ${OSVERSION} < 4300001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500014 )
PKGMESSAGE= pkg-message.freebsd
.endif
.endif
@@ -143,7 +143,7 @@
MAN8+= suexec.8
.endif
-.if ${OSVERSION} < 430001 || ( ${OSVERSION} > 499999 && ${OSVERSION} < 500014 )
+.if ${OSVERSION} < 430001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500014 )
pre-extract:
@if ! ${LDCONFIG} -r | ${GREP} -q -e "-ldescrypt"; then \
${ECHO} ; \
@@ -208,7 +208,7 @@
@${INSTALL_FILE} ${WRKSRC}/${CHANGESERVER} ${PREFIX}/${CHANGESERVER}-dist
@${INSTALL_FILE} ${WRKSRC}/${FPSETPERM} ${PREFIX}/${FPSETPERM}
@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if ${OSVERSION} < 430001 | ( ${OSVERSION} > 499999 && ${OSVERSION} < 500014 )
+.if ${OSVERSION} < 430001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500014 )
.if ${ARCH} == i386
@${CAT} ${PKGMESSAGE}
.endif
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200110190250.f9J2o2F50107>