update to 20040811: fix compilation with GCC 3.4

6 files changed, 38 insertions, 26 deletions

diff --git a/ports-mgmt/pkg_install-devel/Makefile b/ports-mgmt/pkg_install-devel/Makefile
index fbc1d6c679d4..61694bf2f491 100644
--- a/ports-mgmt/pkg_install-devel/Makefile
+++ b/ports-mgmt/pkg_install-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		pkg_install
-PORTVERSION=		20040629
+PORTVERSION=		20040811
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	eik
@@ -24,8 +24,6 @@ MAN1=			pkg_add.1 pkg_create.1 pkg_delete.1 \
 
 PKGREQ=			${WRKDIR}/pkg-req
 
-SED_SCRIPT=		-e "s|%%PORTVERSION%%|${PORTVERSION}|g"
-
 .if defined(PREFIX)
 .if ${PREFIX} == "/usr"
 PKGNAMESUFFIX=		-base-devel
@@ -45,6 +43,14 @@ PLIST_SUB+=		OPENSSL="@comment "
 
 .include <bsd.port.pre.mk>
 
+.if defined(DFOSVERSION)
+PKG_OSVERSION=		${DFOSVERSION}
+SED_SCRIPT=		-e 's/%%OSVERSIONCHK%%/"$$OSVERSION" -ge 110000/g'
+.else
+PKG_OSVERSION=		${OSVERSION}
+SED_SCRIPT=		-e 's/%%OSVERSIONCHK%%/"$$OSVERSION" -ge 491101 -a "$$OSVERSION" -lt 500000 -o "$$OSVERSION" -ge 502120/g'
+.endif
+
 pre-everything::
 	@${ECHO} "======================================================================================="
 	@${ECHO}
@@ -52,7 +58,7 @@ pre-everything::
 	@${ECHO}
 	@${ECHO} "======================================================================================="
 
-.if ${OSVERSION} < 460102
+.if !defined(DFOSVERSION) && ${OSVERSION} < 460102
 check-already-installed:
 .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
 	@if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \
@@ -70,12 +76,12 @@ check-already-installed:
 .endif
 
 pre-configure:
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%MANPREFIX%%,${MANPREFIX},g' \
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+		-e 's|%%MANPREFIX%%|${MANPREFIX}|g' \
 		${FILESDIR}/Makefile.inc > ${WRKDIR}/Makefile.inc
 
-# __FBSDID is undefied for old FreeBSD versions
-.if ${OSVERSION} < 440001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500024 )
+# __FBSDID is undefied for old FreeBSD versions and DragonFlyBSD
+.if defined(DFOSVERSION) || ${OSVERSION} < 440001 || ${OSVERSION} >= 500000 && ${OSVERSION} < 500024
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.c' \
 		| ${XARGS} ${PERL} -pi.orig -e 's/__FBSDID\(("[^"]*")\)/static const char rcsid[] = $$1/'
@@ -86,13 +92,13 @@ post-build:
 
 .if !defined(PACKAGE_BUILDING)
 pre-install:
-	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGREQ} ${PKGNAME} INSTALL
+	@${SETENV} PKG_PREFIX=${PREFIX:Q} OSVERSION=${PKG_OSVERSION:Q} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
 .endif
 
 # Call pkg-install in `do-install:' instead of `pre-install:' because it might
 # deinstall pkg_info, which is fatal during `check-already-installed:'.
 do-install:
-	${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	${SETENV} PKG_PREFIX=${PREFIX:Q} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 
 test: build
diff --git a/ports-mgmt/pkg_install-devel/distinfo b/ports-mgmt/pkg_install-devel/distinfo
index 6287e86b26b4..d2b7959ad937 100644
--- a/ports-mgmt/pkg_install-devel/distinfo
+++ b/ports-mgmt/pkg_install-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (pkg_install-20040629.tar.gz) = 7e563e7d5fe0eb14c7d11de7b69df9e6
-SIZE (pkg_install-20040629.tar.gz) = 86401
+MD5 (pkg_install-20040811.tar.gz) = d95f6a6a11cfba51cd4ea451f444ae47
+SIZE (pkg_install-20040811.tar.gz) = 88003
diff --git a/ports-mgmt/pkg_install-devel/pkg-req b/ports-mgmt/pkg_install-devel/pkg-req
index b57ba6f2ca2d..caf4ed361cf9 100644
--- a/ports-mgmt/pkg_install-devel/pkg-req
+++ b/ports-mgmt/pkg_install-devel/pkg-req
@@ -13,7 +13,7 @@ fi
 
 case $2 in
 INSTALL)
-  if [ "$OSVERSION" -ge 492000 -a "$OSVERSION" -lt 500000 -o "$OSVERSION" -ge 502120 ]; then
+  if [ %%OSVERSIONCHK%% ]; then
     echo "$1: Your base pkg_install tools are already up-to-date."
     exit 1
   fi
diff --git a/sysutils/pkg_install-devel/Makefile b/sysutils/pkg_install-devel/Makefile
index fbc1d6c679d4..61694bf2f491 100644
--- a/sysutils/pkg_install-devel/Makefile
+++ b/sysutils/pkg_install-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		pkg_install
-PORTVERSION=		20040629
+PORTVERSION=		20040811
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	eik
@@ -24,8 +24,6 @@ MAN1=			pkg_add.1 pkg_create.1 pkg_delete.1 \
 
 PKGREQ=			${WRKDIR}/pkg-req
 
-SED_SCRIPT=		-e "s|%%PORTVERSION%%|${PORTVERSION}|g"
-
 .if defined(PREFIX)
 .if ${PREFIX} == "/usr"
 PKGNAMESUFFIX=		-base-devel
@@ -45,6 +43,14 @@ PLIST_SUB+=		OPENSSL="@comment "
 
 .include <bsd.port.pre.mk>
 
+.if defined(DFOSVERSION)
+PKG_OSVERSION=		${DFOSVERSION}
+SED_SCRIPT=		-e 's/%%OSVERSIONCHK%%/"$$OSVERSION" -ge 110000/g'
+.else
+PKG_OSVERSION=		${OSVERSION}
+SED_SCRIPT=		-e 's/%%OSVERSIONCHK%%/"$$OSVERSION" -ge 491101 -a "$$OSVERSION" -lt 500000 -o "$$OSVERSION" -ge 502120/g'
+.endif
+
 pre-everything::
 	@${ECHO} "======================================================================================="
 	@${ECHO}
@@ -52,7 +58,7 @@ pre-everything::
 	@${ECHO}
 	@${ECHO} "======================================================================================="
 
-.if ${OSVERSION} < 460102
+.if !defined(DFOSVERSION) && ${OSVERSION} < 460102
 check-already-installed:
 .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
 	@if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \
@@ -70,12 +76,12 @@ check-already-installed:
 .endif
 
 pre-configure:
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%MANPREFIX%%,${MANPREFIX},g' \
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+		-e 's|%%MANPREFIX%%|${MANPREFIX}|g' \
 		${FILESDIR}/Makefile.inc > ${WRKDIR}/Makefile.inc
 
-# __FBSDID is undefied for old FreeBSD versions
-.if ${OSVERSION} < 440001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500024 )
+# __FBSDID is undefied for old FreeBSD versions and DragonFlyBSD
+.if defined(DFOSVERSION) || ${OSVERSION} < 440001 || ${OSVERSION} >= 500000 && ${OSVERSION} < 500024
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.c' \
 		| ${XARGS} ${PERL} -pi.orig -e 's/__FBSDID\(("[^"]*")\)/static const char rcsid[] = $$1/'
@@ -86,13 +92,13 @@ post-build:
 
 .if !defined(PACKAGE_BUILDING)
 pre-install:
-	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGREQ} ${PKGNAME} INSTALL
+	@${SETENV} PKG_PREFIX=${PREFIX:Q} OSVERSION=${PKG_OSVERSION:Q} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
 .endif
 
 # Call pkg-install in `do-install:' instead of `pre-install:' because it might
 # deinstall pkg_info, which is fatal during `check-already-installed:'.
 do-install:
-	${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	${SETENV} PKG_PREFIX=${PREFIX:Q} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 
 test: build
diff --git a/sysutils/pkg_install-devel/distinfo b/sysutils/pkg_install-devel/distinfo
index 6287e86b26b4..d2b7959ad937 100644
--- a/sysutils/pkg_install-devel/distinfo
+++ b/sysutils/pkg_install-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (pkg_install-20040629.tar.gz) = 7e563e7d5fe0eb14c7d11de7b69df9e6
-SIZE (pkg_install-20040629.tar.gz) = 86401
+MD5 (pkg_install-20040811.tar.gz) = d95f6a6a11cfba51cd4ea451f444ae47
+SIZE (pkg_install-20040811.tar.gz) = 88003
diff --git a/sysutils/pkg_install-devel/pkg-req b/sysutils/pkg_install-devel/pkg-req
index b57ba6f2ca2d..caf4ed361cf9 100644
--- a/sysutils/pkg_install-devel/pkg-req
+++ b/sysutils/pkg_install-devel/pkg-req
@@ -13,7 +13,7 @@ fi
 
 case $2 in
 INSTALL)
-  if [ "$OSVERSION" -ge 492000 -a "$OSVERSION" -lt 500000 -o "$OSVERSION" -ge 502120 ]; then
+  if [ %%OSVERSIONCHK%% ]; then
     echo "$1: Your base pkg_install tools are already up-to-date."
     exit 1
   fi