ports/61860: Fix databases/pgbash

[Sascha Holzleiter]

>Number:         61860
>Category:       ports
>Synopsis:       Fix databases/pgbash
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 24 19:00:32 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Sascha Holzleiter
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD dreamland.chief.home 5.2-CURRENT FreeBSD 5.2-CURRENT #2: Thu Jan 22 02:43:50 CET 2004 root at dreamland.chief.home:/usr/obj/usr/src/sys/HOTKERN i386


>Description:
	Actually use GNU_CONFIGURE instead of doing it myself all wrong ;)
	This should also fix building on amd64.
	Also tidy up a few outputs.
>How-To-Repeat:
>Fix:

--- pgbash.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 1)
+++ Makefile	(working copy)
@@ -22,26 +22,27 @@
 
 WRKSRC=		${WRKDIR}/pgbash-7.3/src/bash-2.05a
 
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
+CONFIGURE_ARGS=	--pginc-prefix=${LOCALBASE}/include --pglib-prefix=${LOCALBASE}/lib
+
 post-extract:
-	${ECHO_MSG} ">>> extracting bash"
-	${TAR} -C ${WRKDIR}/pgbash-7.3/src -xzf ${DISTDIR}/bash-2.05a.tar.gz
+	@${ECHO_MSG} ">>> extracting bash"
+	@${TAR} -C ${WRKDIR}/pgbash-7.3/src -xzf ${DISTDIR}/bash-2.05a.tar.gz
 
 pre-configure:
-	${REINPLACE_CMD} -e 's|/etc/pgbashrc|${PREFIX}/etc/pgbashrc|g' \
+	@${REINPLACE_CMD} -e 's|/etc/pgbashrc|${PREFIX}/etc/pgbashrc|g' \
 	${WRKDIR}/pgbash-7.3/src/bash-2.05a-patch/shell.c.patch
 .for i in Makefile.in.patch builtins-Makefile.in.patch \
 	builtins-declare.def.patch builtins-mkbuilrins.c.patch \
 	builtins-set.def.patch builtins-setattr.def.patch configure.in.patch \
 	configure.patch parse.y.patch shell.c.patch variables.c.patch
-	${PATCH} -d ${WRKSRC} -p1 < ${WRKDIR}/pgbash-7.3/src/bash-2.05a-patch/${i}
+	@${ECHO_MSG} ">>> applying pg patches"
+	@${PATCH} -d ${WRKSRC} -p1 < ${WRKDIR}/pgbash-7.3/src/bash-2.05a-patch/${i}
 .endfor
 
-do-configure:
-	cd ${WRKSRC}; ./configure --pginc-prefix=${LOCALBASE}/include --pglib-prefix=${LOCALBASE}/lib
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pgbash ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/pgbash-7.3/rc/pgbashrc ${PREFIX}/etc/pgbashrc-dist
--- pgbash.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: