Date: Sun, 5 Oct 2003 08:21:07 GMT From: Jens Rehsack <rehsack@liwing.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: nork@FreeBSD.org Subject: ports/57601: [PATCH] Fix port bug found by Oliver Eikmeier in PR ports/57502 Message-ID: <200310050821.h958L76M030768@helo.liwing.de> Resent-Message-ID: <200310050830.h958UT0P054882@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 57601
>Category: ports
>Synopsis: [PATCH] Fix port bug found by Oliver Eikmeier in PR ports/57502
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 05 01:30:29 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Jens Rehsack
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
LiWing IT-Services
>Environment:
System: FreeBSD statler 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Thu Oct 2 19:33:40 GMT 2003 root@statler:/usr/obj/usr/src/sys/STATLER i386
>Description:
Move the .include <bsd.port.pre.mk> down as far as possible :-)
>How-To-Repeat:
>Fix:
--- patch-include-bsd.port.pre.mk begins here ---
--- lang/php4/Makefile.orig Sun Oct 5 07:59:49 2003
+++ lang/php4/Makefile Sun Oct 5 08:02:43 2003
@@ -142,12 +142,6 @@
IS_INTERACTIVE= yes
.endif
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
-
.if !defined(WITHOUT_APACHE)
.if exists(${LOCALBASE}/include/apache2/apr.h)
WITH_APACHE2= yes
@@ -439,15 +433,6 @@
CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
.endif
-.if defined(WITH_OPENSSL) || defined(WITH_OPENSSL_DEP)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-CONFIGURE_ARGS+=--with-openssl-dir=${OPENSSLBASE}
-.endif
-
-.if defined(WITH_OPENSSL)
-CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
-.endif
-
.if defined(WITH_ORACLE)
BUILD_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
RUN_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
@@ -579,6 +564,21 @@
.if defined(WITH_ZLIB)
CONFIGURE_ARGS+=--with-zlib=yes
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=--disable-ipv6
+.endif
+
+.if defined(WITH_OPENSSL) || defined(WITH_OPENSSL_DEP)
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+CONFIGURE_ARGS+=--with-openssl-dir=${OPENSSLBASE}
+.endif
+
+.if defined(WITH_OPENSSL)
+CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
.endif
pre-patch:
--- lang/php5/Makefile.orig Sun Oct 5 08:10:55 2003
+++ lang/php5/Makefile Sun Oct 5 08:12:11 2003
@@ -140,12 +140,6 @@
IS_INTERACTIVE= yes
.endif
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
-
.if !defined(WITHOUT_APACHE)
.if exists(${LOCALBASE}/include/apache2/apr.h)
WITH_APACHE2= yes
@@ -421,15 +415,6 @@
CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
.endif
-.if defined(WITH_OPENSSL) || defined(WITH_OPENSSL_DEP)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-CONFIGURE_ARGS+=--with-openssl-dir=${OPENSSLBASE}
-.endif
-
-.if defined(WITH_OPENSSL)
-CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
-.endif
-
.if defined(WITH_ORACLE)
BUILD_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
RUN_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
@@ -566,6 +551,21 @@
.if defined(WITH_ZLIB)
CONFIGURE_ARGS+=--with-zlib
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=--disable-ipv6
+.endif
+
+.if defined(WITH_OPENSSL) || defined(WITH_OPENSSL_DEP)
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+CONFIGURE_ARGS+=--with-openssl-dir=${OPENSSLBASE}
+.endif
+
+.if defined(WITH_OPENSSL)
+CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
.endif
pre-patch:
--- patch-include-bsd.port.pre.mk ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310050821.h958L76M030768>