Date: Tue, 18 Nov 2003 04:53:40 +0100 (CET) From: Palle Girgensohn <girgen@pingpong.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/59395: [MAINTAINER] databases/postgresql-docs: use DOCSDIR Message-ID: <200311180353.hAI3resL038127@palle.girgensohn.se> Resent-Message-ID: <200311180400.hAI40dBh082780@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59395
>Category: ports
>Synopsis: [MAINTAINER] databases/postgresql-docs: use DOCSDIR
>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: Mon Nov 17 20:00:38 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Palle Girgensohn
>Release: FreeBSD 4.9-RELEASE i386
>Organization:
Ping Pong AB
>Environment:
System: FreeBSD palle.girgensohn.se 4.9-RELEASE FreeBSD 4.9-RELEASE #6: Tue Nov 4 22:56:29 CET
>Description:
- move back to using .include instead of cd xx && make -V
- use DOCSDIR everywhere
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- postgresql-docs-7.4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql-docs/Makefile,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile
--- Makefile 4 Sep 2003 11:16:38 -0000 1.8
+++ Makefile 18 Nov 2003 03:52:07 -0000
@@ -4,37 +4,32 @@
#
# $FreeBSD: ports/databases/postgresql-docs/Makefile,v 1.8 2003/09/04 11:16:38 osa Exp $
#
-POSTGRESQL_PORT?= databases/postgresql7
-PORTNAME= postgresql
-PORTVERSION!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
-PORTREVISION?= 0
-CATEGORIES= databases java
-MASTER_SITES= ${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
+PORTREVISION= 0
PKGNAMESUFFIX= -docs
-DISTFILES= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
-DIST_SUBDIR= postgresql
MAINTAINER= girgen@pingpong.net
COMMENT= The PostgreSQL documentation set
-MD5_FILE= ${.CURDIR}/../../${POSTGRESQL_PORT}/distinfo
+POSTGRESQL_SUBPORT= YES
+POSTGRESQL_PORT?= databases/postgresql7
+.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile>
+DISTFILES= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
+.undef USE_GMAKE
+.undef GNU_CONFIGURE
NO_BUILD= YES
do-install:
@ $(MKDIR) ${DOCSDIR}/html; \
${GZIP_CMD} -dc ${WRKSRC}/doc/postgres.tar.gz | \
- ( cd $(DOCSDIR)/html && $(TAR) xf - )
+ ( cd ${DOCSDIR}/html && $(TAR) xf - )
post-install:
@ ${TAR} ztf ${WRKSRC}/doc/postgres.tar.gz | ${GREP} -v /$$ | \
- ${XARGS} printf "share/doc/postgresql/html/%s\n" >> ${TMPPLIST} ;\
- for dir in `$(TAR) ztf ${WRKSRC}/doc/postgres.tar.gz | ${GREP} /$$` ; do \
- ${ECHO} @dirrm $$dir >> ${TMPPLIST} ;\
- done ;\
- ${ECHO} @dirrm share/doc/postgresql/html >> ${TMPPLIST} ;\
- ${ECHO} @dirrm share/doc/postgresql >> ${TMPPLIST} ;\
- ${ECHO} '@unexec rmdir %D/share/postgresql 2> /dev/null || true' >> ${TMPPLIST}
+ ${SED} "s,^,${DOCSDIR:S,^${PREFIX}/,,}/html/," >> ${TMPPLIST} ;\
+ ${TAR} ztf ${WRKSRC}/doc/postgres.tar.gz | ${GREP} /$$ | \
+ ${SED} "s,^,@dirrm\ ," >> ${TMPPLIST} ;\
+ ${ECHO} @dirrm ${DOCSDIR:S,^${PREFIX}/,,}/html >> ${TMPPLIST} ;\
+ ${ECHO} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,} 2> /dev/null || true" >> ${TMPPLIST}
.include <bsd.port.mk>
--- postgresql-docs-7.4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311180353.hAI3resL038127>