Date: Mon, 5 May 2014 13:48:25 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353002 - in head/databases: ip4r iplike pg_reorg postgresql-libpgeasy postgresql-libpqxx postgresql-libpqxx3 Message-ID: <201405051348.s45DmPfC006754@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon May 5 13:48:25 2014 New Revision: 353002 URL: http://svnweb.freebsd.org/changeset/ports/353002 QAT: https://qat.redports.org/buildarchive/r353002/ Log: Convert to USES=pgsql While here: databases/pg_reorg - stagify databases/iplike - convert to USES=libtool - strip binarie databases/ip4r - strip binaries databases/postgresql-libpgeasy - convert to USES=libtool - strip binaries - stagify databases/postgresql-libpqxx - convert to USES=libtool - strip binaries databases/postgresql-libpqxx3 - convert to USES=libtool - strip binaries Modified: head/databases/ip4r/Makefile head/databases/iplike/Makefile head/databases/pg_reorg/Makefile head/databases/postgresql-libpgeasy/Makefile head/databases/postgresql-libpgeasy/pkg-plist head/databases/postgresql-libpqxx/Makefile head/databases/postgresql-libpqxx/pkg-plist head/databases/postgresql-libpqxx3/Makefile head/databases/postgresql-libpqxx3/pkg-plist Modified: head/databases/ip4r/Makefile ============================================================================== --- head/databases/ip4r/Makefile Mon May 5 12:58:03 2014 (r353001) +++ head/databases/ip4r/Makefile Mon May 5 13:48:25 2014 (r353002) @@ -9,21 +9,20 @@ MASTER_SITES= http://pgfoundry.org/frs/d MAINTAINER= tobez@FreeBSD.org COMMENT= IP address and IP range index types for PostgreSQL -USE_PGSQL= YES -USE_GMAKE= YES +USES= gmake pgsql MAKE_ARGS= USE_PGXS=1 # In order to make this port PREFIX-safe, we override the install target # and install the three files manually -NO_STAGE= yes do-install: - @${INSTALL} -m ${BINMODE} ${WRKSRC}/ip4r.so ${PREFIX}/lib/postgresql - @${MKDIR} ${PREFIX}/share/postgresql/contrib + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/postgresql + @${INSTALL_LIB} -m ${BINMODE} ${WRKSRC}/ip4r.so ${STAGEDIR}${PREFIX}/lib/postgresql + @${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql/contrib @${INSTALL_DATA} ${WRKSRC}/ip4r.sql \ - ${PREFIX}/share/postgresql/contrib - @${MKDIR} ${PREFIX}/share/doc/postgresql/contrib + ${STAGEDIR}${PREFIX}/share/postgresql/contrib + @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/postgresql/contrib @${INSTALL_DATA} ${WRKSRC}/README.ip4r \ - ${PREFIX}/share/doc/postgresql/contrib + ${STAGEDIR}${PREFIX}/share/doc/postgresql/contrib .include <bsd.port.mk> Modified: head/databases/iplike/Makefile ============================================================================== --- head/databases/iplike/Makefile Mon May 5 12:58:03 2014 (r353001) +++ head/databases/iplike/Makefile Mon May 5 13:48:25 2014 (r353002) @@ -9,13 +9,13 @@ MASTER_SITES= SF/opennms/IPLIKE/stable-2 MAINTAINER= venture37@geeklan.co.uk COMMENT= C implementation of the OpenNMS iplike stored procedure +USES= libtool pgsql GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_PGSQL= yes SUB_FILES= pkg-message +INSTALL_TARGET= install-strip -PLIST_FILES= lib/postgresql/iplike.la \ - lib/postgresql/iplike.so \ - sbin/install_iplike.sh +PLIST_FILES= lib/postgresql/iplike.so \ + sbin/install_iplike.sh .include <bsd.port.mk> Modified: head/databases/pg_reorg/Makefile ============================================================================== --- head/databases/pg_reorg/Makefile Mon May 5 12:58:03 2014 (r353001) +++ head/databases/pg_reorg/Makefile Mon May 5 13:48:25 2014 (r353002) @@ -11,33 +11,21 @@ COMMENT= PostgreSQL utility to reorganiz LICENSE= BSD -DESTINY= ${WRKDIR}/destino -MAKE_ENV= USE_PGXS=0 \ - DESTDIR=${DESTINY} -USES= gmake -USE_PGSQL= yes +MAKE_ENV= USE_PGXS=0 +USES= gmake pgsql -OPTIONS_DEFINE= DOCS +PLIST_FILES= bin/pg_reorg \ + lib/postgresql/pg_reorg.so \ + share/postgresql/contrib/pg_reorg--1.1.8.sql \ + share/postgresql/contrib/pg_reorg.sql \ + share/postgresql/contrib/uninstall_pg_reorg.sql +PLIST_DIRSTRY= share/postgresql/contrib +PORTDOCS= * -NO_STAGE= yes -.include <bsd.port.options.mk> +OPTIONS_DEFINE= DOCS post-install: -.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} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/) .include <bsd.port.mk> Modified: head/databases/postgresql-libpgeasy/Makefile ============================================================================== --- head/databases/postgresql-libpgeasy/Makefile Mon May 5 12:58:03 2014 (r353001) +++ head/databases/postgresql-libpgeasy/Makefile Mon May 5 13:48:25 2014 (r353002) @@ -11,23 +11,21 @@ MASTER_SITE_SUBDIR= projects/gborg/pgeas DIST_SUBDIR= postgresql MAINTAINER= pgsql@FreeBSD.org -COMMENT= An easy-to-use C interface to PostgreSQL +COMMENT= Easy-to-use C interface to PostgreSQL -USE_AUTOTOOLS= libtool -USE_PGSQL= YES -USES= gmake +OPTIONS_DEFINE= DOCS EXAMPLES + +USES= gmake libtool pgsql USE_LDCONFIG= YES GNU_CONFIGURE= YES DOCSDIR= ${PREFIX}/share/doc/postgresql/${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/postgresql/${PORTNAME} +INSTALL_TARGET= install-strip -NO_STAGE= yes post-install: -.if !defined(NOPORTDOCS) - @- ${MKDIR} -m 755 ${EXAMPLESDIR} ;\ - ${INSTALL} ${WRKSRC}/examples/* ${EXAMPLESDIR} ;\ - ${MKDIR} -m 755 ${DOCSDIR} ;\ - ${INSTALL} ${WRKSRC}/docs/libpgeasy.html ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/libpgeasy.html ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/databases/postgresql-libpgeasy/pkg-plist ============================================================================== --- head/databases/postgresql-libpgeasy/pkg-plist Mon May 5 12:58:03 2014 (r353001) +++ head/databases/postgresql-libpgeasy/pkg-plist Mon May 5 13:48:25 2014 (r353002) @@ -1,8 +1,8 @@ include/libpgeasy.h lib/libpgeasy.a -lib/libpgeasy.la lib/libpgeasy.so lib/libpgeasy.so.3 +lib/libpgeasy.so.3.0.0 %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile %%PORTDOCS%%%%EXAMPLESDIR%%/pginsert.c %%PORTDOCS%%%%EXAMPLESDIR%%/pgmultiresult.c Modified: head/databases/postgresql-libpqxx/Makefile ============================================================================== --- head/databases/postgresql-libpqxx/Makefile Mon May 5 12:58:03 2014 (r353001) +++ head/databases/postgresql-libpqxx/Makefile Mon May 5 13:48:25 2014 (r353002) @@ -3,6 +3,7 @@ PORTNAME= libpqxx PORTVERSION= 4.0.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://pqxx.org/download/software/libpqxx/ PKGNAMEPREFIX= postgresql- @@ -16,23 +17,15 @@ LICENSE= BSD3CLAUSE CONFLICTS= postgresql-libpqxx-3.* postgresql-libpqxx3-3.* PORTSCOUT= limit:^2\. -USE_PGSQL= yes USE_PYTHON_BUILD= yes -USES= gmake shebangfix +USES= gmake libtool pgsql shebangfix GNU_CONFIGURE= yes USE_LDCONFIG= yes -SOVERSION= 4 -PLIST_SUB= PORTVERSION=${PORTVERSION:R} \ - SOVERSION=${SOVERSION} +PLIST_SUB= PORTVERSION=${PORTVERSION:R} SHEBANG_FILES= ${WRKSRC}/tools/splitconfig python_CMD= ${PYTHON_CMD} CONFIGURE_ARGS= --enable-shared \ --disable-dependency-tracking -post-install: -# This is needed for ldconfig - ${LN} -sf libpqxx-${PORTVERSION}.so \ - ${STAGEDIR}${PREFIX}/lib/libpqxx.so.${SOVERSION} - .include <bsd.port.mk> Modified: head/databases/postgresql-libpqxx/pkg-plist ============================================================================== --- head/databases/postgresql-libpqxx/pkg-plist Mon May 5 12:58:03 2014 (r353001) +++ head/databases/postgresql-libpqxx/pkg-plist Mon May 5 13:48:25 2014 (r353002) @@ -93,9 +93,7 @@ include/pqxx/version include/pqxx/version.hxx lib/libpqxx-%%PORTVERSION%%.so lib/libpqxx.a -lib/libpqxx.la lib/libpqxx.so -lib/libpqxx.so.%%SOVERSION%% libdata/pkgconfig/libpqxx.pc @dirrm include/pqxx/internal/gates @dirrm include/pqxx/internal Modified: head/databases/postgresql-libpqxx3/Makefile ============================================================================== --- head/databases/postgresql-libpqxx3/Makefile Mon May 5 12:58:03 2014 (r353001) +++ head/databases/postgresql-libpqxx3/Makefile Mon May 5 13:48:25 2014 (r353002) @@ -3,6 +3,7 @@ PORTNAME= libpqxx PORTVERSION= 3.1.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://pqxx.org/download/software/${PORTNAME}/ PKGNAMEPREFIX= postgresql- @@ -15,12 +16,12 @@ COMMENT= New C++ interface for PostgreSQ CONFLICTS= postgresql-libpqxx-[2-4].* PORTSCOUT= limit:^2\. -USE_PGSQL= yes -USES= gmake pkgconfig shebangfix +USES= gmake libtool pgsql pkgconfig shebangfix GNU_CONFIGURE= yes USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} USE_PYTHON_BUILD= yes +INSTALL_TARGET= install-strip SHEBANG_FILES= tools/splitconfig python_CMD= ${PYTHON_CMD} Modified: head/databases/postgresql-libpqxx3/pkg-plist ============================================================================== --- head/databases/postgresql-libpqxx3/pkg-plist Mon May 5 12:58:03 2014 (r353001) +++ head/databases/postgresql-libpqxx3/pkg-plist Mon May 5 13:48:25 2014 (r353002) @@ -83,7 +83,6 @@ include/pqxx/version include/pqxx/version.hxx lib/libpqxx-3.1.so lib/libpqxx.a -lib/libpqxx.la lib/libpqxx.so libdata/pkgconfig/libpqxx.pc @dirrm include/pqxx/internal/gates
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405051348.s45DmPfC006754>