From owner-svn-ports-head@FreeBSD.ORG Sun Jul 21 17:16:14 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D16468FA; Sun, 21 Jul 2013 17:16:14 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C2078A5B; Sun, 21 Jul 2013 17:16:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6LHGE4k000326; Sun, 21 Jul 2013 17:16:14 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6LHGE1p000324; Sun, 21 Jul 2013 17:16:14 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201307211716.r6LHGE1p000324@svn.freebsd.org> From: John Marino Date: Sun, 21 Jul 2013 17:16:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323404 - head/databases/pg_reorg X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jul 2013 17:16:15 -0000 Author: marino Date: Sun Jul 21 17:16:14 2013 New Revision: 323404 URL: http://svnweb.freebsd.org/changeset/ports/323404 Log: databases/pg_reorg: Upgrade to v1.1.8, use DESTDIR This version upgrade is required for PostgreSQL 9.2 support and was proposed by the maintainer. Additional changes were added by myself: 1) Header trimmed 2) USE_GMAKE changed to USES+=gmake 3) NOPORTSDOCS changed to options/DOCS 4) Proposed logic for alternative PLIST was replaced with DESTDIR support The package list changes directory structure depending if postgresql 91 or higher client is used. This could have been handled with PLIST_SUB (rather than an alternate pkg-plist) but PGSQL_VER variable isn't evaluated until much later. Using an intermediate DESTDIR scheme not only makes the DOCS option handling cleaner, it makes the pkg-plist creation bulletproof. It also gives this port a head start for future "Stage" support. PR: ports/179954 Submitted by: marino Approved by: bapt (mentor), maintainer Deleted: head/databases/pg_reorg/pkg-plist Modified: head/databases/pg_reorg/Makefile head/databases/pg_reorg/distinfo Modified: head/databases/pg_reorg/Makefile ============================================================================== --- head/databases/pg_reorg/Makefile Sun Jul 21 16:40:20 2013 (r323403) +++ head/databases/pg_reorg/Makefile Sun Jul 21 17:16:14 2013 (r323404) @@ -1,28 +1,42 @@ -# New ports collection makefile for: pg_reorg -# Date created: January 15, 2011 -# Whom: alp@sfedu.ru +# Created by: Alexander Pyhalov # $FreeBSD$ PORTNAME= pg_reorg -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.8 CATEGORIES= databases -MASTER_SITES= http://pgfoundry.org/frs/download.php/3104/ +MASTER_SITES= http://pgfoundry.org/frs/download.php/3395/ MAINTAINER= alp@sfedu.ru COMMENT= PostgreSQL utility to reorganize tables LICENSE= BSD -MAKE_ENV= USE_PGXS=0 -USE_GMAKE= yes +DESTINY= ${WRKDIR}/destino +MAKE_ENV= USE_PGXS=0 \ + DESTDIR=${DESTINY} +USES= gmake USE_PGSQL= yes -WRKSRC= ${WRKDIR}/${PORTNAME} +OPTIONS_DEFINE= DOCS + +.include post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}/) +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DESTINY}${DOCSDIR} + @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DESTINY}${DOCSDIR}/) .endif + ${CP} -pR ${DESTINY}${PREFIX}/ ${PREFIX}/ + @cd ${DESTINY}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ + ${SORT} > ${WRKDIR}/PLIST.all + @cd ${DESTINY}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \ + ${SED} -e '/lib\/postgresql$$/d' -e '/share\/doc$$/d' \ + -e '/share\/postgresql$$/d' -e '/share\/postgresql\/extension$$/d' \ + -e 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.all + @echo "@unexec rmdir %D/lib/postgresql 2>/dev/null || true" >> ${WRKDIR}/PLIST.all + @echo "@unexec rmdir %D/share/doc 2>/dev/null || true" >> ${WRKDIR}/PLIST.all + @echo "@unexec rmdir %D/share/postgresql/extension 2>/dev/null || true" >> ${WRKDIR}/PLIST.all + @echo "@unexec rmdir %D/share/postgresql 2>/dev/null || true" >> ${WRKDIR}/PLIST.all + @${CAT} ${WRKDIR}/PLIST.all >> ${TMPPLIST} .include Modified: head/databases/pg_reorg/distinfo ============================================================================== --- head/databases/pg_reorg/distinfo Sun Jul 21 16:40:20 2013 (r323403) +++ head/databases/pg_reorg/distinfo Sun Jul 21 17:16:14 2013 (r323404) @@ -1,2 +1,2 @@ -SHA256 (pg_reorg-1.1.7.tar.gz) = 5ca0b75ee3136e85768621e2e9fd1e0969588bffe7ddbeba69b292226bd2cf21 -SIZE (pg_reorg-1.1.7.tar.gz) = 56686 +SHA256 (pg_reorg-1.1.8.tar.gz) = 7abf7e7be4c6519caaced4bf44a43321b620e6128fa1be63f58a534894f54c4d +SIZE (pg_reorg-1.1.8.tar.gz) = 59185