summaryrefslogtreecommitdiff
path: root/databases/postgresql90/Makefile.common
diff options
context:
space:
mode:
Diffstat (limited to 'databases/postgresql90/Makefile.common')
-rw-r--r--databases/postgresql90/Makefile.common31
1 files changed, 7 insertions, 24 deletions
diff --git a/databases/postgresql90/Makefile.common b/databases/postgresql90/Makefile.common
index 0cf419bc640..5c8f76b3b2e 100644
--- a/databases/postgresql90/Makefile.common
+++ b/databases/postgresql90/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2012/12/07 21:19:50 adam Exp $
+# $NetBSD: Makefile.common,v 1.23 2013/02/09 11:19:11 adam Exp $
#
# used by databases/postgresql90-adminpack/Makefile
# used by databases/postgresql90-client/Makefile
@@ -21,7 +21,7 @@
# <lang>-postgresql client-side interface to PostgreSQL
# postgresql-<lang> server-side module for PostgreSQL backend
-DISTNAME= postgresql-9.0.11
+DISTNAME= postgresql-9.0.12
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
EXTRACT_SUFX= .tar.bz2
@@ -56,31 +56,17 @@ PG_TEMPLATE.IRIX= irix5
PG_TEMPLATE.${OPSYS}= ${LOWER_OPSYS}
.endif
-PG_SUBPREFIX?= # empty
-.if empty(PG_SUBPREFIX)
-PG_PREFIX= ${PREFIX}
-PLIST_SUBST+= PG_SUBPREFIX=
-.else
-PG_PREFIX= ${PREFIX}/${PG_SUBPREFIX}
-BUILD_DEFS+= PG_SUBPREFIX
-PLIST_SUBST+= PG_SUBPREFIX=${PG_SUBPREFIX:/=}/
-BUILDLINK_PASSTHRU_DIRS+= ${PG_PREFIX}
-.endif
-PG_DATA_DIR= ${PG_PREFIX}/share/postgresql
-PG_DOC_DIR= ${PG_PREFIX}/share/doc/postgresql
-PG_LOCALE_DIR= ${PG_PREFIX}/${PKGLOCALEDIR}/locale
-PG_ETC_DIR= ${PKG_SYSCONFDIR:S/^${PREFIX}\//${PG_PREFIX}\//}
+PG_DATA_DIR= ${PREFIX}/share/postgresql
+PG_DOC_DIR= ${PREFIX}/share/doc/postgresql
+PG_LOCALE_DIR= ${PREFIX}/${PKGLOCALEDIR}/locale
+PG_ETC_DIR= ${PKG_SYSCONFDIR}
GNU_CONFIGURE= yes
-GNU_CONFIGURE_LIBDIR= ${PG_PREFIX}/lib
-CONFIGURE_ARGS+= --bindir=${PG_PREFIX}/bin
-CONFIGURE_ARGS+= --includedir=${PG_PREFIX}/include
CONFIGURE_ARGS+= --sysconfdir=${PG_ETC_DIR}
CONFIGURE_ARGS+= --datadir=${PG_DATA_DIR}
+CONFIGURE_ARGS+= --docdir=${PG_DOC_DIR}
CONFIGURE_ARGS+= --localedir=${PG_LOCALE_DIR}
-CONFIGURE_ARGS+= --with-docdir=${PG_DOC_DIR}
CONFIGURE_ARGS+= --with-template=${PG_TEMPLATE.${OPSYS}}
-GNU_CONFIGURE_MANDIR= $(PG_PREFIX)/$(PKGMANDIR)
CONFIGURE_ARGS+= --enable-nls
CONFIGURE_ARGS+= --without-perl
@@ -131,6 +117,3 @@ post-extract:
.endif
.include "../../databases/postgresql90/options.mk"
-
-# Help to generate PLIST
-PRINT_PLIST_AWK+= {sub("^${PG_SUBPREFIX}/", ""); $$0 = "$${PG_SUBPREFIX}" $$0;}