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
This commit is contained in:
parent
1278298a95
commit
3980028e05
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=45524
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user