Date: Thu, 10 Oct 2013 00:09:35 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329946 - in head/databases: postgresql84-client postgresql84-contrib postgresql84-docs postgresql84-server postgresql90-client postgresql90-contrib postgresql90-docs postgresql90-plper... Message-ID: <201310100009.r9A09Zah023159@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Thu Oct 10 00:09:35 2013 New Revision: 329946 URL: http://svnweb.freebsd.org/changeset/ports/329946 Log: - Fix pkg name collision Reviewed by: pgsql@ With hat: pgsql@ Modified: head/databases/postgresql84-client/Makefile head/databases/postgresql84-contrib/Makefile head/databases/postgresql84-docs/Makefile head/databases/postgresql84-server/Makefile head/databases/postgresql90-client/Makefile head/databases/postgresql90-contrib/Makefile head/databases/postgresql90-docs/Makefile head/databases/postgresql90-plperl/Makefile head/databases/postgresql90-plpython/Makefile head/databases/postgresql90-server/Makefile head/databases/postgresql91-client/Makefile head/databases/postgresql91-contrib/Makefile head/databases/postgresql91-docs/Makefile head/databases/postgresql91-plperl/Makefile head/databases/postgresql91-pltcl/Makefile head/databases/postgresql91-server/Makefile head/databases/postgresql92-client/Makefile head/databases/postgresql92-contrib/Makefile head/databases/postgresql92-docs/Makefile head/databases/postgresql92-server/Makefile head/databases/postgresql93-client/Makefile head/databases/postgresql93-contrib/Makefile head/databases/postgresql93-server/Makefile Modified: head/databases/postgresql84-client/Makefile ============================================================================== --- head/databases/postgresql84-client/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql84-client/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -3,7 +3,8 @@ PORTNAME= postgresql PORTREVISION= 0 -PKGNAMESUFFIX= -client +PKGNAMESUFFIX?= ${DISTV:S/.//}-client +DISTV= ${DISTVERSION:R} COMMENT= PostgreSQL database (client) @@ -13,6 +14,7 @@ BUILD_DIRS= config src/include src/inter src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles CLIENT_ONLY= yes +COMPONENT= -client USE_LDCONFIG= yes NO_STAGE= yes Modified: head/databases/postgresql84-contrib/Makefile ============================================================================== --- head/databases/postgresql84-contrib/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql84-contrib/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -4,7 +4,8 @@ PORTNAME= postgresql PORTREVISION= 0 CATEGORIES= databases -PKGNAMESUFFIX= -contrib +PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib +DISTV= ${DISTVERSION:R} MAINTAINER= pgsql@FreeBSD.org COMMENT= The contrib utilities from the PostgreSQL distribution @@ -21,6 +22,7 @@ BUILD_DIRS= src/port contrib INSTALL_DIRS= contrib SLAVE_ONLY= yes +COMPONENT= -contrib CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl NO_STAGE= yes Modified: head/databases/postgresql84-docs/Makefile ============================================================================== --- head/databases/postgresql84-docs/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql84-docs/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -3,7 +3,8 @@ PORTNAME= postgresql PORTREVISION= 0 -PKGNAMESUFFIX= -docs +PKGNAMESUFFIX?= ${DISTV:S/.//}-docs +DISTV= ${DISTVERSION:R} MAINTAINER= pgsql@FreeBSD.org COMMENT= The PostgreSQL documentation set @@ -15,6 +16,7 @@ WANT_PGSQL_VER?=84 NO_BUILD= YES SLAVE_ONLY= YES +COMPONENT= -docs PATCHDIR= mustnotexist PGDOCSDIR?= ${DOCSDIR}/release-${PGSQL_VER} Modified: head/databases/postgresql84-server/Makefile ============================================================================== --- head/databases/postgresql84-server/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql84-server/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -7,15 +7,16 @@ PORTREVISION?= 1 CATEGORIES?= databases MASTER_SITES= PGSQL MASTER_SITE_SUBDIR= source/v${DISTVERSION} -PKGNAMESUFFIX?= -server +PKGNAMESUFFIX?= ${DISTV:S/.//}-server +DISTV= ${DISTVERSION:R} MAINTAINER?= pgsql@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere -CONFLICTS?= ${PORTNAME}-client-[^${PORTVERSION:R:R}].* \ - ${PORTNAME}${PKGNAMESUFFIX}-[^${PORTVERSION:R:R}].* \ - ${PORTNAME}-client-8.[^${PORTVERSION:R:E}].* \ - ${PORTNAME}${PKGNAMESUFFIX}-8.[^${PORTVERSION:R:E}].* +CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}].*-client.* \ + ${PORTNAME}${COMPONENT}[^${PORTVERSION:R:R}].* \ + ${PORTNAME}8.[^${PORTVERSION:R:E}].*-client.* \ + ${PORTNAME}${COMPONENT}8.[^${PORTVERSION:R:E}].* WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql @@ -23,9 +24,8 @@ DIST_SUBDIR= postgresql ICU_PATCHFILE?= pg-840-icu-2009-09-15.diff.gz UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//} -LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX} -PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX} +PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} USE_BZIP2= yes .if !defined(NO_BUILD) USES+= gmake @@ -46,7 +46,7 @@ CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ LDFLAGS_SL="${LDFLAGS_SL}" -PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX} +PLIST= ${PKGDIR}/pkg-plist${COMPONENT} BUILD_DIRS?= src/timezone src/backend src/backend/utils/mb/conversion_procs \ src/backend/snowball src/bin/initdb src/bin/pg_ctl \ @@ -56,6 +56,7 @@ INSTALL_DIRS?= ${BUILD_DIRS} .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) SERVER_ONLY= yes +COMPONENT= -server USE_RC_SUBR= postgresql USE_PGSQL= yes WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} @@ -320,12 +321,12 @@ do-build: cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \ done -. if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in) -SUB_FILES+= pkg-message${PKGNAMESUFFIX} -PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} +. if exists(${FILESDIR}/pkg-message${COMPONENT}.in) +SUB_FILES+= pkg-message${COMPONENT} +PKGMESSAGE= ${WRKSRC}/pkg-message${COMPONENT} . endif -. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) -SUB_FILES+= pkg-install${PKGNAMESUFFIX} +. if exists(${FILESDIR}/pkg-install${COMPONENT}.in) +SUB_FILES+= pkg-install${COMPONENT} PLIST_SUB+= PG_USER=${PG_USER} . endif .endif @@ -355,7 +356,7 @@ do-install: . endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${DOCSDIR} ;\ - ${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\ + ${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${COMPONENT} ;\ ${CAT} ${PKGMESSAGE} ;\ fi .endif # !NO_BUILD Modified: head/databases/postgresql90-client/Makefile ============================================================================== --- head/databases/postgresql90-client/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql90-client/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -3,7 +3,8 @@ PORTNAME= postgresql PORTREVISION= 0 -PKGNAMESUFFIX= -client +PKGNAMESUFFIX?= ${DISTV:S/.//}-client +DISTV= ${DISTVERSION:R} COMMENT= PostgreSQL database (client) @@ -14,6 +15,7 @@ BUILD_DIRS= config src/include src/inter doc src/makefiles INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes +COMPONENT= -client USE_LDCONFIG= yes NO_STAGE= yes Modified: head/databases/postgresql90-contrib/Makefile ============================================================================== --- head/databases/postgresql90-contrib/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql90-contrib/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -4,7 +4,8 @@ PORTNAME= postgresql PORTREVISION= 0 CATEGORIES= databases -PKGNAMESUFFIX= -contrib +PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib +DISTV= ${DISTVERSION:R} MAINTAINER= pgsql@FreeBSD.org COMMENT= The contrib utilities from the PostgreSQL distribution @@ -22,6 +23,7 @@ BUILD_DIRS= src/port contrib INSTALL_DIRS= contrib SLAVE_ONLY= yes +COMPONENT= -contrib CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl LDFLAGS+= ${PTHREAD_LIBS} -L${PREFIX}/lib Modified: head/databases/postgresql90-docs/Makefile ============================================================================== --- head/databases/postgresql90-docs/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql90-docs/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -2,6 +2,7 @@ # $FreeBSD$ WANT_PGSQL_VER=90 +COMPONENT= -docs NO_STAGE= yes .include "${.CURDIR}/../postgresql91-docs/Makefile" Modified: head/databases/postgresql90-plperl/Makefile ============================================================================== --- head/databases/postgresql90-plperl/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql90-plperl/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -3,7 +3,8 @@ PORTNAME= postgresql CATEGORIES= databases perl5 -PKGNAMESUFFIX= -plperl +PKGNAMESUFFIX?= ${DISTV:S/.//}-plperl +DISTV= ${DISTVERSION:R} MAINTAINER= pgsql@FreeBSD.org COMMENT= Write SQL functions for PostgreSQL using Perl5 @@ -20,6 +21,7 @@ CONFIGURE_ARGS= --with-perl BUILD_DIRS= src/backend src/pl/plperl INSTALL_DIRS= src/pl/plperl SLAVE_ONLY= yes +COMPONENT= -plperl NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql90-plpython/Makefile ============================================================================== --- head/databases/postgresql90-plpython/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql90-plpython/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -2,7 +2,8 @@ PORTNAME= postgresql CATEGORIES= databases python -PKGNAMESUFFIX= -plpython +PKGNAMESUFFIX?= ${DISTV:S/.//}-plpython +DISTV= ${DISTVERSION:R} MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Python to write SQL functions @@ -17,6 +18,7 @@ USE_PYTHON?= yes PYTHON_MAJOR_VER= ${PYTHON_VER:R} CONFIGURE_ARGS= --with-python PLIST_SUB= PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} +COMPONENT= -plpython .if ${PYTHON_MAJOR_VER} == 3 PLIST_SUB+= PYTHON3="" Modified: head/databases/postgresql90-server/Makefile ============================================================================== --- head/databases/postgresql90-server/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql90-server/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -3,7 +3,8 @@ DISTVERSION?= 9.0.13 PORTREVISION= 0 -PKGNAMESUFFIX?= -server +PKGNAMESUFFIX?= ${DISTV:S/.//}-server +DISTV= ${DISTVERSION:R} MAINTAINER?= pgsql@FreeBSD.org @@ -14,6 +15,7 @@ BUILD_DIRS?= src/timezone src/backend sr src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl INSTALL_DIRS?= ${BUILD_DIRS} +COMPONENT?= -server .if defined(CLIENT_ONLY) MAN1= # no MAN1 for 9.0 only Modified: head/databases/postgresql91-client/Makefile ============================================================================== --- head/databases/postgresql91-client/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql91-client/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= postgresql -PKGNAMESUFFIX= -client +PKGNAMESUFFIX?= ${DISTV:S/.//}-client +DISTV= ${DISTVERSION:R} COMMENT= PostgreSQL database (client) @@ -14,6 +15,7 @@ BUILD_DIRS= config src/include src/inter INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes +COMPONENT= -client USE_LDCONFIG= yes NO_STAGE= yes Modified: head/databases/postgresql91-contrib/Makefile ============================================================================== --- head/databases/postgresql91-contrib/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql91-contrib/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -22,6 +22,7 @@ BUILD_DIRS= src/port contrib INSTALL_DIRS= contrib SLAVE_ONLY= yes +COMPONENT= -contrib CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl LDFLAGS+= ${PTHREAD_LIBS} -L${PREFIX}/lib Modified: head/databases/postgresql91-docs/Makefile ============================================================================== --- head/databases/postgresql91-docs/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql91-docs/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -3,7 +3,8 @@ PORTNAME= postgresql PORTREVISION= 0 -PKGNAMESUFFIX= -docs +PKGNAMESUFFIX?= ${DISTV:S/.//}-docs +DISTV= ${DISTVERSION:R} MAINTAINER= pgsql@FreeBSD.org COMMENT= The PostgreSQL documentation set @@ -14,6 +15,7 @@ USE_PGSQL= YES WANT_PGSQL_VER?=91 SLAVE_ONLY= YES +COMPONENT= -docs PGDOCSREL?= ${DOCSDIR_REL}/release-${PGSQL_VER} PGDOCSDIR?= ${PREFIX}/${PGDOCSREL} Modified: head/databases/postgresql91-plperl/Makefile ============================================================================== --- head/databases/postgresql91-plperl/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql91-plperl/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -2,6 +2,7 @@ # $FreeBSD$ WANT_PGSQL_VER= 91 +COMPONENT= -plperl NO_STAGE= yes .include "${.CURDIR}/../postgresql90-plperl/Makefile" Modified: head/databases/postgresql91-pltcl/Makefile ============================================================================== --- head/databases/postgresql91-pltcl/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql91-pltcl/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -4,10 +4,10 @@ PORTNAME= postgresql PORTREVISION= 3 CATEGORIES= databases tcl -PKGNAMESUFFIX= -pltcl +PKGNAMESUFFIX?= ${DISTV:S/.//}-pltcl MAINTAINER= pgsql@FreeBSD.org -COMMENT= A module for using Tcl to write SQL functions +COMMENT= Module for using Tcl to write SQL functions MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server @@ -29,6 +29,7 @@ MAKE_ENV+= TCL_INCDIR="${TCL_INCLUDEDIR} BUILD_DIRS= src/backend src/pl/tcl INSTALL_DIRS= src/pl/tcl SLAVE_ONLY= yes +COMPONENT= -pltcl NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql91-server/Makefile ============================================================================== --- head/databases/postgresql91-server/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql91-server/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -7,15 +7,16 @@ PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= PGSQL MASTER_SITE_SUBDIR= source/v${DISTVERSION} -PKGNAMESUFFIX?= -server +PKGNAMESUFFIX?= ${DISTV:S/.//}-server +DISTV= ${DISTVERSION:R} MAINTAINER?= pgsql@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere -CONFLICTS?= ${PORTNAME}-client-[^${PORTVERSION:R:R}].* \ - ${PORTNAME}${PKGNAMESUFFIX}-[^${PORTVERSION:R:R}].* \ - ${PORTNAME}-client-9.[^${PORTVERSION:R:E}].* \ - ${PORTNAME}${PKGNAMESUFFIX}-9.[^${PORTVERSION:R:E}].* +CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}]-client.* \ + ${PORTNAME}${COMPONENT}[^${PORTVERSION:R:R}].* \ + ${PORTNAME}9.[^${PORTVERSION:R:E}].*-client.* \ + ${PORTNAME}${COMPONENT}9.[^${PORTVERSION:R:E}].* WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql @@ -24,13 +25,11 @@ ICU_PATCHFILE?= pg-910-icu-2012-12-19.di .if !defined(SLAVE_ONLY) UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//} -LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX} .else # Contrib has different options from -client/-server UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}${PKGNAMESUFFIX} -LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME} .endif -PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX} +PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} USE_BZIP2= yes .if !defined(NO_BUILD) USES+= gmake @@ -51,7 +50,7 @@ CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ LDFLAGS_SL="${LDFLAGS_SL}" -PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX} +PLIST= ${PKGDIR}/pkg-plist${COMPONENT} INSTALL_DIRS?= src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ @@ -62,6 +61,7 @@ INSTALL_DIRS?= src/timezone src/backend BUILD_DIRS?= src/port ${INSTALL_DIRS} .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) +COMPONENT= -server SERVER_ONLY= yes USE_RC_SUBR= postgresql USE_PGSQL= yes @@ -341,12 +341,12 @@ do-build: cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \ done -. if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in) -SUB_FILES+= pkg-message${PKGNAMESUFFIX} -PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} +. if exists(${FILESDIR}/pkg-message${COMPONENT}.in) +SUB_FILES+= pkg-message${COMPONENT} +PKGMESSAGE= ${WRKSRC}/pkg-message${COMPONENT} . endif -. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) -SUB_FILES+= pkg-install${PKGNAMESUFFIX} +. if exists(${FILESDIR}/pkg-install${COMPONENT}.in) +SUB_FILES+= pkg-install${COMPONENT} PLIST_SUB+= PG_USER=${PG_USER} . endif @@ -374,7 +374,7 @@ do-install: . endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${DOCSDIR} ;\ - ${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\ + ${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${COMPONENT} ;\ ${CAT} ${PKGMESSAGE} ;\ fi .endif # !NO_BUILD Modified: head/databases/postgresql92-client/Makefile ============================================================================== --- head/databases/postgresql92-client/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql92-client/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= postgresql -PKGNAMESUFFIX= -client +PKGNAMESUFFIX?= ${DISTV:S/.//}-client +DISTV= ${DISTVERSION:R} COMMENT= PostgreSQL database (client) @@ -14,6 +15,7 @@ BUILD_DIRS= config src/include src/inter INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes +COMPONENT= -client USE_LDCONFIG= yes NO_STAGE= yes Modified: head/databases/postgresql92-contrib/Makefile ============================================================================== --- head/databases/postgresql92-contrib/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql92-contrib/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -3,7 +3,8 @@ PORTNAME= postgresql CATEGORIES= databases -PKGNAMESUFFIX= -contrib +PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib +DISTV= ${DISTVERSION:R} MAINTAINER= pgsql@FreeBSD.org COMMENT= The contrib utilities from the PostgreSQL distribution @@ -21,6 +22,7 @@ BUILD_DIRS= src/port contrib INSTALL_DIRS= contrib SLAVE_ONLY= yes +COMPONENT= -contrib CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl LDFLAGS+= ${PTHREAD_LIBS} -L${PREFIX}/lib Modified: head/databases/postgresql92-docs/Makefile ============================================================================== --- head/databases/postgresql92-docs/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql92-docs/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -2,6 +2,7 @@ # $FreeBSD$ WANT_PGSQL_VER=92 +COMPONENT= -docs NO_STAGE= yes .include "${.CURDIR}/../postgresql91-docs/Makefile" Modified: head/databases/postgresql92-server/Makefile ============================================================================== --- head/databases/postgresql92-server/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql92-server/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -7,15 +7,16 @@ PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= PGSQL MASTER_SITE_SUBDIR= source/v${DISTVERSION} -PKGNAMESUFFIX?= -server +PKGNAMESUFFIX?= ${DISTV:S/.//}-server +DISTV= ${DISTVERSION:R} MAINTAINER?= pgsql@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere -CONFLICTS?= ${PORTNAME}-client-[^${PORTVERSION:R:R}].* \ - ${PORTNAME}${PKGNAMESUFFIX}-[^${PORTVERSION:R:R}].* \ - ${PORTNAME}-client-9.[^${PORTVERSION:R:E}].* \ - ${PORTNAME}${PKGNAMESUFFIX}-9.[^${PORTVERSION:R:E}].* +CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}].*-client-[^${PORTVERSION:R:R}].* \ + ${PORTNAME}[^${PORTVERSION:R:R}].*${COMPONENT} \ + ${PORTNAME}9[^${PORTVERSION:R:E}].*-client-9.[^${PORTVERSION:R:E}].* \ + ${PORTNAME}9[^${PORTVERSION:R:E}]${COMPONENT}.* WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql @@ -24,13 +25,11 @@ ICU_PATCHFILE?= pg-910-icu-2012-12-19.di .if !defined(SLAVE_ONLY) UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//} -LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX} .else # Contrib has different options from -client/-server UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}${PKGNAMESUFFIX} -LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME} .endif -PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX} +PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} USE_BZIP2= yes .if !defined(NO_BUILD) USES+= gmake @@ -51,7 +50,7 @@ CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ LDFLAGS_SL="${LDFLAGS_SL}" -PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX} +PLIST= ${PKGDIR}/pkg-plist${COMPONENT} INSTALL_DIRS?= src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ @@ -63,6 +62,7 @@ BUILD_DIRS?= src/port ${INSTALL_DIRS} .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) SERVER_ONLY= yes +COMPONENT= -server USE_RC_SUBR= postgresql USE_PGSQL= yes WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} @@ -343,12 +343,12 @@ do-build: cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \ done -. if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in) -SUB_FILES+= pkg-message${PKGNAMESUFFIX} -PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} +. if exists(${FILESDIR}/pkg-message${COMPONENT}.in) +SUB_FILES+= pkg-message${COMPONENT} +PKGMESSAGE= ${WRKSRC}/pkg-message${COMPONENT} . endif -. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) -SUB_FILES+= pkg-install${PKGNAMESUFFIX} +. if exists(${FILESDIR}/pkg-install${COMPONENT}.in) +SUB_FILES+= pkg-install${COMPONENT} PLIST_SUB+= PG_USER=${PG_USER} . endif @@ -376,7 +376,7 @@ do-install: . endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${DOCSDIR} ;\ - ${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\ + ${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${COMPONENT} ;\ ${CAT} ${PKGMESSAGE} ;\ fi .endif # !NO_BUILD Modified: head/databases/postgresql93-client/Makefile ============================================================================== --- head/databases/postgresql93-client/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql93-client/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -3,7 +3,8 @@ PORTNAME= postgresql PORTREVISION= 0 -PKGNAMESUFFIX= -client +PKGNAMESUFFIX?= ${DISTV:S/.//}-client +DISTV= ${DISTVERSION:R} COMMENT= PostgreSQL database (client) @@ -15,6 +16,7 @@ BUILD_DIRS= config src/include src/inter INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes +COMPONENT= -client USE_LDCONFIG= yes USES= pkgconfig Modified: head/databases/postgresql93-contrib/Makefile ============================================================================== --- head/databases/postgresql93-contrib/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql93-contrib/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -4,7 +4,8 @@ PORTNAME= postgresql PORTREVISION= 0 CATEGORIES= databases -PKGNAMESUFFIX= -contrib +PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib +DISTV= ${DISTVERSION:R} MAINTAINER= pgsql@FreeBSD.org COMMENT= The contrib utilities from the PostgreSQL distribution @@ -22,6 +23,7 @@ BUILD_DIRS= src/port src/common contrib INSTALL_DIRS= contrib SLAVE_ONLY= yes +COMPONENT= -contrib CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --disable-nls LDFLAGS+= ${PTHREAD_LIBS} -L${PREFIX}/lib Modified: head/databases/postgresql93-server/Makefile ============================================================================== --- head/databases/postgresql93-server/Makefile Thu Oct 10 00:03:44 2013 (r329945) +++ head/databases/postgresql93-server/Makefile Thu Oct 10 00:09:35 2013 (r329946) @@ -3,7 +3,8 @@ DISTVERSION?= 9.3.0 PORTREVISION?= 1 -PKGNAMESUFFIX?= -server +PKGNAMESUFFIX?= ${DISTV:S/.//}-server +DISTV= ${DISTVERSION:R} MAINTAINER?= pgsql@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310100009.r9A09Zah023159>