From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Feb 18 13:50:11 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 780B6106566C for ; Sat, 18 Feb 2012 13:50:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4F47A8FC13 for ; Sat, 18 Feb 2012 13:50:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q1IDoB78050557 for ; Sat, 18 Feb 2012 13:50:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q1IDoB2a050556; Sat, 18 Feb 2012 13:50:11 GMT (envelope-from gnats) Resent-Date: Sat, 18 Feb 2012 13:50:11 GMT Resent-Message-Id: <201202181350.q1IDoB2a050556@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ben Morrow Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 37D61106567B for ; Sat, 18 Feb 2012 13:41:04 +0000 (UTC) (envelope-from mauzo@morrow.me.uk) Received: from isis.morrow.me.uk (isis.morrow.me.uk [204.109.63.142]) by mx1.freebsd.org (Postfix) with ESMTP id DDAF38FC16 for ; Sat, 18 Feb 2012 13:41:03 +0000 (UTC) Received: from anubis.morrow.me.uk (host86-169-241-9.range86-169.btcentralplus.com [86.169.241.9]) (Authenticated sender: mauzo) by isis.morrow.me.uk (Postfix) with ESMTPSA id 94B7F451BD for ; Sat, 18 Feb 2012 13:24:51 +0000 (UTC) Received: by anubis.morrow.me.uk (Postfix, from userid 1001) id BF23526EC6; Sat, 18 Feb 2012 13:24:47 +0000 (GMT) Message-Id: <20120218132447.BF23526EC6@anubis.morrow.me.uk> Date: Sat, 18 Feb 2012 13:24:47 +0000 (GMT) From: Ben Morrow To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/165265: [patch] databases/postgresql-docs: build docs for Pg 9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Ben Morrow List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Feb 2012 13:50:11 -0000 >Number: 165265 >Category: ports >Synopsis: [patch] databases/postgresql-docs: build docs for Pg 9 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Feb 18 13:50:10 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Ben Morrow >Release: FreeBSD 8.2-RELEASE-p5 amd64 >Organization: morrow.me.uk >Environment: System: FreeBSD anubis.morrow.me.uk 8.2-RELEASE-p5 FreeBSD 8.2-RELEASE-p5 #1: Fri Dec 30 19:03:35 GMT 2011 mauzo@anubis:/usr/obj/usr/src/sys/ANUBIS amd64 >Description: Currently the postgresql-docs port is marken BROKEN when build against PostgreSQL 9.0 and 9.1 because the tarball no longer contains prebuilt docs. This patch updates the port to build the docs from source for those versions. >How-To-Repeat: >Fix: --- postgresql-docs-9.1 begins here --- diff -ur .zfs/snapshot/orig/databases/postgresql-docs/Makefile databases/postgresql-docs/Makefile --- .zfs/snapshot/orig/databases/postgresql-docs/Makefile 2012-02-18 12:44:44.989481551 +0000 +++ databases/postgresql-docs/Makefile 2012-02-18 13:05:43.134509362 +0000 @@ -30,15 +30,42 @@ PGSQL_VER= ${DEFAULT_PGSQL_VER} .endif -.if (${PGSQL_VER} == 90) || (${PGSQL_VER} == 91) -BROKEN= "not implemented yet" -.endif - -NO_BUILD= YES SLAVE_ONLY= YES -PATCHDIR= mustnotexist PGDOCSDIR?= ${DOCSDIR}/release-${PGSQL_VER} +PGDOCSREL?= ${PGDOCSDIR:S,^${PREFIX}/,,} + +.if ${PGSQL_VER} >= 90 + +_sgmldir= ${PREFIX}/share/sgml +_dbdir= ${_sgmldir}/docbook +_tp= ${PORTSDIR}/textproc + +BUILD_DEPENDS+= onsgmls:${_tp}/opensp \ + openjade:${_tp}/openjade \ + ${_sgmldir}/iso8879/catalog:${_tp}/iso8879 \ + ${_dbdir}/dsssl/modular/catalog:${_tp}/dsssl-docbook-modular \ + ${_dbdir}/4.2/docbook.dtd:${_tp}/docbook-420 + +do-build: + ${GMAKE} -C ${WRKSRC} html + +do-install: + ${MKDIR} ${PGDOCSDIR} + (cd ${WRKSRC}/doc/src/sgml/html && \ + ${COPYTREE_SHARE} \* ${PGDOCSDIR}) + +post-install: + @(cd ${PREFIX} && \ + ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST} + @${ECHO} "@dirrm ${PGDOCSREL}" >> ${TMPPLIST} + @${ECHO} "@unexec rmdir %D/${DOCSDIR_REL} 2>/dev/null || true" \ + >> ${TMPPLIST} + +.else + +NO_BUILD= YES +PATCHDIR= mustnotexist do-install: @ $(MKDIR) ${PGDOCSDIR}; \ @@ -53,4 +80,6 @@ ${ECHO} @dirrm ${PGDOCSDIR:S,^${PREFIX}/,,} >> ${TMPPLIST} ;\ ${ECHO} "@unexec rmdir %D/${DOCSDIR:S,^${PREFIX}/,,} 2> /dev/null || true" >> ${TMPPLIST} +.endif # 9 or greater + .include "${MASTERDIR}/Makefile" diff -ur .zfs/snapshot/orig/databases/postgresql91-server/Makefile databases/postgresql91-server/Makefile --- .zfs/snapshot/orig/databases/postgresql91-server/Makefile 2012-02-18 12:46:00.581039268 +0000 +++ databases/postgresql91-server/Makefile 2012-02-18 12:56:06.338275264 +0000 @@ -334,7 +334,7 @@ @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif -.if !defined(NO_BUILD) +.if !defined(NO_BUILD) && !target(do-build) do-build: @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks @@ -366,26 +366,29 @@ @${SED} -n s,pgsql,${PG_GROUP},gp ${PORTSDIR}/GIDs > ${WRKDIR}/pggid . endif +. if !target(do-install) do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \ done -. if defined(SERVER_ONLY) +. if defined(SERVER_ONLY) @ ${MKDIR} ${PREFIX}/share/postgresql ;\ ${MKDIR} ${PREFIX}/etc/periodic/daily ;\ ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ ${PREFIX}/etc/periodic/daily ${MKDIR} ${PREFIX}/${PG_USER} && ${CHOWN} ${PG_USER}:${PG_GROUP} ${PREFIX}/${PG_USER} -. endif # SERVER_ONLY -. if defined(CLIENT_ONLY) +. endif # SERVER_ONLY +. if defined(CLIENT_ONLY) @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install-local -. endif +. endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${DOCSDIR} ;\ ${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\ ${CAT} ${PKGMESSAGE} ;\ fi +. endif # !target(do-install) + .endif # !NO_BUILD .if defined(SERVER_ONLY) --- postgresql-docs-9.1 ends here --- >Release-Note: >Audit-Trail: >Unformatted: