summaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorsheldonh <sheldonh@FreeBSD.org>2001-07-27 11:56:39 +0000
committersheldonh <sheldonh@FreeBSD.org>2001-07-27 11:56:39 +0000
commit007b170be2724080e7430057e79123810b10b8f7 (patch)
tree1614e5c7216cf59c2a3d4fbb75ee9acbc61f8380 /databases
parentb0e4db87fb54c4788ae27db692f270c0c8d24314 (diff)
downloadFreeBSD-ports-007b170be2724080e7430057e79123810b10b8f7.zip
FreeBSD-ports-007b170be2724080e7430057e79123810b10b8f7.tar.gz
Work around the way in which the package building cluster validates
ports by defining LIB_DEPENDS for the BATCH defaults in the Makefile. The dynamic determination of LIB_DEPENDS in configure.postgresql remains in place for the !BATCH case and is unaffected by this. Remove trailing whitespace and an extraneous LDCONFIG_DIRS. Submitted by: maintainer
Diffstat (limited to 'databases')
-rw-r--r--databases/postgresql-devel-server/Makefile7
-rw-r--r--databases/postgresql-devel/Makefile7
-rw-r--r--databases/postgresql7/Makefile7
-rw-r--r--databases/postgresql73-server/Makefile7
-rw-r--r--databases/postgresql73/Makefile7
-rw-r--r--databases/postgresql74-server/Makefile7
-rw-r--r--databases/postgresql80-server/Makefile7
-rw-r--r--databases/postgresql81-server/Makefile7
-rw-r--r--databases/postgresql82-server/Makefile7
-rw-r--r--databases/postgresql83-server/Makefile7
-rw-r--r--databases/postgresql84-server/Makefile7
-rw-r--r--databases/postgresql90-server/Makefile7
-rw-r--r--databases/postgresql91-server/Makefile7
-rw-r--r--databases/postgresql92-server/Makefile7
14 files changed, 70 insertions, 28 deletions
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index a344f35..ea93a35 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -28,7 +28,6 @@ MAINTAINER= girgen@partitur.se
DIST_SUBDIR= postgresql
INSTALLS_SHLIB= YES
-LDCONFIG_DIRS= %%PREFIX%%/lib
DOCDIR= ${WRKDIR}/${DISTNAME}/doc
PLIST= ${WRKDIR}/.PLIST.generated
@@ -93,6 +92,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
# to determine the correct plist.
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.else
+# make utility targets like depends and describe happy
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
+ tk83:${PORTSDIR}/x11-toolkits/tk83
.endif
pre-everything:
@@ -100,7 +103,7 @@ pre-everything:
pre-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
+.if !defined(BATCH)
# remind folks twice for a while, so they really don't miss the layout shift
@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
.endif
OpenPOWER on IntegriCloud