diff options
| author | jgh <jgh@FreeBSD.org> | 2013-10-10 08:09:35 +0800 |
|---|---|---|
| committer | jgh <jgh@FreeBSD.org> | 2013-10-10 08:09:35 +0800 |
| commit | cefd1771279265697ca1f04595ac86d7a01ccec8 (patch) | |
| tree | 70cdf6e4ee0fea6e38e7defbc7e3ce9db69ed0ef /databases/postgresql84-server | |
| parent | 0cb5cdbb4f2709fde7373480565ddce30151ff79 (diff) | |
| download | freebsd-ports-gnome-cefd1771279265697ca1f04595ac86d7a01ccec8.tar.gz freebsd-ports-gnome-cefd1771279265697ca1f04595ac86d7a01ccec8.tar.zst freebsd-ports-gnome-cefd1771279265697ca1f04595ac86d7a01ccec8.zip | |
- Fix pkg name collision
Reviewed by: pgsql@
With hat: pgsql@
Diffstat (limited to 'databases/postgresql84-server')
| -rw-r--r-- | databases/postgresql84-server/Makefile | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index d774953ed381..8ad0c74a3dcf 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -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 |