ports/56404: recent postgresql port changes break with 4.8-R make(1)

[Palle Girgensohn]

>Number:         56404
>Category:       ports
>Synopsis:       recent postgresql port changes break with 4.8-R make(1)
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 04 01:50:17 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Palle Girgensohn <girgen at pingpong.net>
>Release:        FreeBSD 4-STABLE i386
>Organization:
PING PONG
>Environment:
>Description:
The last changes to the postgresql-* ports is broken for systems where
make(1) does not accept the `-C' argument. It was only six months
since this switch entered the FreeBSD make code, apparently (I'm
unfortunately all too fluent in gnu make... :( )

So, this patch will unbreak the postgresql-* ports for systems built
before Apr 15 2003 (includes 4.8-RELEASE).
>How-To-Repeat:
	
>Fix:
--- p5-postgresql-plperl/Makefile.bak	Wed Sep  3 11:53:51 2003
+++ p5-postgresql-plperl/Makefile	Wed Sep  3 23:35:12 2003
@@ -7,14 +7,14 @@
 POSTGRESQL_PORT?=	databases/postgresql7
 
 PORTNAME=	postgresql
-PORTVERSION!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V PORTVERSION
+PORTVERSION!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V MASTER_SITE_SUBDIR
+MASTER_SITE_SUBDIR!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
 PKGNAMEPREFIX=	p5-
 PKGNAMESUFFIX=	-plperl
-DISTFILES!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V DISTFILES
+DISTFILES!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
 DIST_SUBDIR=	postgresql
 
 MAINTAINER=	girgen at pingpong.net
--- postgresql-contrib/Makefile.bak	Wed Sep  3 02:17:10 2003
+++ postgresql-contrib/Makefile	Wed Sep  3 23:35:12 2003
@@ -7,13 +7,13 @@
 POSTGRESQL_PORT?=	databases/postgresql7
 
 PORTNAME=	postgresql
-PORTVERSION!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V PORTVERSION
+PORTVERSION!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
 PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V MASTER_SITE_SUBDIR
+MASTER_SITE_SUBDIR!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
 PKGNAMESUFFIX=	-contrib
-DISTFILES!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V DISTFILES
+DISTFILES!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
 DIST_SUBDIR=	postgresql
 
 MAINTAINER=	girgen at pingpong.net
--- postgresql-docs/Makefile.bak	Wed Sep  3 00:13:03 2003
+++ postgresql-docs/Makefile	Wed Sep  3 23:35:12 2003
@@ -7,10 +7,10 @@
 POSTGRESQL_PORT?=	databases/postgresql7
 
 PORTNAME=	postgresql
-PORTVERSION!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V PORTVERSION
+PORTVERSION!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V MASTER_SITE_SUBDIR
+MASTER_SITE_SUBDIR!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
 PKGNAMESUFFIX=	-docs
 DISTFILES=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	postgresql
--- postgresql-jdbc/Makefile.bak	Wed Sep  3 00:11:58 2003
+++ postgresql-jdbc/Makefile	Wed Sep  3 23:35:12 2003
@@ -7,13 +7,13 @@
 POSTGRESQL_PORT?=	databases/postgresql7
 
 PORTNAME=	postgresql
-PORTVERSION!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V PORTVERSION
+PORTVERSION!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
 PORTREVISION=	0
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V MASTER_SITE_SUBDIR
+MASTER_SITE_SUBDIR!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
 PKGNAMESUFFIX=	-jdbc
-DISTFILES!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V DISTFILES
+DISTFILES!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
 DIST_SUBDIR=	postgresql
 
 MAINTAINER=	girgen at pingpong.net
--- postgresql-plpython/Makefile.bak	Wed Sep  3 01:19:30 2003
+++ postgresql-plpython/Makefile	Wed Sep  3 23:35:12 2003
@@ -7,13 +7,13 @@
 POSTGRESQL_PORT?=	databases/postgresql7
 
 PORTNAME=	postgresql
-PORTVERSION!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V PORTVERSION
+PORTVERSION!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
 PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V MASTER_SITE_SUBDIR
+MASTER_SITE_SUBDIR!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
 PKGNAMESUFFIX=	-plpython
-DISTFILES!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V DISTFILES
+DISTFILES!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
 DIST_SUBDIR=	postgresql
 
 MAINTAINER=	girgen at pingpong.net
--- postgresql-pltcl/Makefile.bak	Wed Sep  3 01:27:05 2003
+++ postgresql-pltcl/Makefile	Wed Sep  3 23:35:12 2003
@@ -7,13 +7,13 @@
 POSTGRESQL_PORT?=	databases/postgresql7
 
 PORTNAME=	postgresql
-PORTVERSION!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V PORTVERSION
+PORTVERSION!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
 PORTREVISION=	1
 CATEGORIES=	databases tcl83
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V MASTER_SITE_SUBDIR
+MASTER_SITE_SUBDIR!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
 PKGNAMESUFFIX=	-pltcl
-DISTFILES!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V DISTFILES
+DISTFILES!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
 DIST_SUBDIR=	postgresql
 
 MAINTAINER=	girgen at pingpong.net
--- postgresql-tcltk/Makefile.bak	Wed Sep  3 01:28:35 2003
+++ postgresql-tcltk/Makefile	Wed Sep  3 23:35:12 2003
@@ -7,13 +7,13 @@
 POSTGRESQL_PORT?=	databases/postgresql7
 
 PORTNAME=	postgresql
-PORTVERSION!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V PORTVERSION
+PORTVERSION!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
 PORTREVISION=	1
 CATEGORIES=	databases tcl83 tk83
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V MASTER_SITE_SUBDIR
+MASTER_SITE_SUBDIR!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
 PKGNAMESUFFIX=	-tcltk
-DISTFILES!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V DISTFILES
+DISTFILES!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
 DIST_SUBDIR=	postgresql
 
 MAINTAINER=	girgen at pingpong.net
--- py-PyGreSQL/Makefile.bak	Wed Sep  3 01:42:11 2003
+++ py-PyGreSQL/Makefile	Wed Sep  3 23:35:12 2003
@@ -7,13 +7,13 @@
 POSTGRESQL_PORT?=	databases/postgresql7
 
 PORTNAME=	PyGreSQL
-PORTVERSION!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V PORTVERSION
+PORTVERSION!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
 PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V MASTER_SITE_SUBDIR
+MASTER_SITE_SUBDIR!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V DISTFILES
+DISTFILES!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
 DIST_SUBDIR=	postgresql
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 
>Release-Note:
>Audit-Trail:
>Unformatted: