Date: Thu, 17 Jul 2003 12:50:19 -0700 (PDT) From: Oliver Eikemeier <eikemeier@fillmore-labs.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/54436: [NEW PORTS] split net/openldap2[012] into -client and -server Message-ID: <200307171950.h6HJoJr7071167@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/54436; it has been noted by GNATS.
From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
To: freebsd-gnats-submit@FreeBSD.org
Cc:
Subject: Re: ports/54436: [NEW PORTS] split net/openldap2[012] into -client
and -server
Date: Thu, 17 Jul 2003 21:46:59 +0200
After some discussion I came to the conclusion that it is better
to keep the client (slave) port minimal. So I need to shift the
pkg-* files from the client to the server port:
Assuming the shar files above are unpacked, do
mv net/openldap20-client/pkg-descr net/openldap20-server/pkg-descr.client
mv net/openldap20-client/pkg-message net/openldap20-server/pkg-message.client
mv net/openldap20-client/pkg-plist net/openldap20-server/pkg-plist.client
mv net/openldap20-client/files/manpages net/openldap20-server/files/manpages
mv net/openldap21-client/pkg-descr net/openldap21-server/pkg-descr.client
mv net/openldap21-client/pkg-message net/openldap21-server/pkg-message.client
mv net/openldap21-client/pkg-plist net/openldap21-server/pkg-plist.client
mv net/openldap21-client/files/manpages net/openldap21-server/files/manpages
mv net/openldap22-client/pkg-descr net/openldap22-server/pkg-descr.client
mv net/openldap22-client/pkg-message net/openldap22-server/pkg-message.client
mv net/openldap22-client/pkg-plist net/openldap22-server/pkg-plist.client
mv net/openldap22-client/files/manpages net/openldap22-server/files/manpages
rm net/openldap2[012]-client/pkg-install
rmdir net/openldap2[012]-client/files
and the following patch:
--- openldap-cleanup.patch begins here ---
diff -u net/openldap20-server/Makefile.orig net/openldap20-server/Makefile
--- net/openldap20-server/Makefile.orig Sun Jul 13 14:20:56 2003
+++ net/openldap20-server/Makefile Thu Jul 17 21:26:28 2003
@@ -44,9 +44,11 @@
.if defined(CLIENT_ONLY)
OPENLDAP_PORTVERSION= 0
OPENLDAP_PKGNAMESUFFIX?=-client
+OPENLDAP_PKGFILESUFX?= .client
.else
OPENLDAP_PORTVERSION= 0
OPENLDAP_PKGNAMESUFFIX?=-server
+OPENLDAP_PKGFILESUFX?=
LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client
.endif
@@ -55,7 +57,7 @@
USE_REINPLACE= yes
USE_LIBTOOL_VER= 13
-DESCR= ${.CURDIR}/pkg-descr
+DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
PLIST= ${WRKDIR}/pkg-plist
PKGINSTALL= ${WRKDIR}/pkg-install
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -147,7 +149,7 @@
.include <bsd.port.pre.mk>
.if defined(CLIENT_ONLY)
-.include "${.CURDIR}/files/manpages"
+.include "${FILESDIR}/manpages"
.endif
pre-everything::
@@ -181,7 +183,10 @@
@${SED} ${SED_SCRIPT} ${FILESDIR}/${script} >${WRKDIR}/${script}
.endfor
.for text in pkg-install pkg-message
- @${SED} ${SED_SCRIPT} ${.CURDIR}/${text} >${WRKDIR}/${text}
+ @if [ -f ${MASTERDIR}/${text}${OPENLDAP_PKGFILESUFX} ]; then \
+ ${SED} ${SED_SCRIPT} ${MASTERDIR}/${text}${OPENLDAP_PKGFILESUFX} \
+ >${WRKDIR}/${text}; \
+ fi
.endfor
.if !defined(CLIENT_ONLY)
@@ -191,7 +196,7 @@
.endif
pre-install:
- @${CP} ${.CURDIR}/pkg-plist ${PLIST}
+ @${CP} ${MASTERDIR}/pkg-plist${OPENLDAP_PKGFILESUFX} ${PLIST}
.if defined(CLIENT_ONLY)
.if !defined(NOPORTDOCS)
@for dir in rfc drafts; do \
diff -u net/openldap21-server/Makefile.orig net/openldap21-server/Makefile
--- net/openldap21-server/Makefile.orig Sun Jul 13 14:05:36 2003
+++ net/openldap21-server/Makefile Thu Jul 17 21:28:47 2003
@@ -44,9 +44,11 @@
.if defined(CLIENT_ONLY)
OPENLDAP_PORTVERSION= 0
OPENLDAP_PKGNAMESUFFIX?=-client
+OPENLDAP_PKGFILESUFX?= .client
.else
OPENLDAP_PORTVERSION= 0
OPENLDAP_PKGNAMESUFFIX?=-server
+OPENLDAP_PKGFILESUFX?=
LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21-client
.endif
@@ -55,7 +57,7 @@
USE_REINPLACE= yes
USE_LIBTOOL_VER= 14
-DESCR= ${.CURDIR}/pkg-descr
+DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
PLIST= ${WRKDIR}/pkg-plist
PKGINSTALL= ${WRKDIR}/pkg-install
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -159,7 +161,7 @@
.include <bsd.port.pre.mk>
.if defined(CLIENT_ONLY)
-.include "${.CURDIR}/files/manpages"
+.include "${FILESDIR}/manpages"
.endif
pre-everything::
@@ -194,7 +196,10 @@
@${SED} ${SED_SCRIPT} ${FILESDIR}/${script} >${WRKDIR}/${script}
.endfor
.for text in pkg-install pkg-message
- @${SED} ${SED_SCRIPT} ${.CURDIR}/${text} >${WRKDIR}/${text}
+ @if [ -f ${MASTERDIR}/${text}${OPENLDAP_PKGFILESUFX} ]; then \
+ ${SED} ${SED_SCRIPT} ${MASTERDIR}/${text}${OPENLDAP_PKGFILESUFX} \
+ >${WRKDIR}/${text}; \
+ fi
.endfor
.if !defined(CLIENT_ONLY)
@@ -204,7 +209,7 @@
.endif
pre-install:
- @${CP} ${.CURDIR}/pkg-plist ${PLIST}
+ @${CP} ${MASTERDIR}/pkg-plist${OPENLDAP_PKGFILESUFX} ${PLIST}
.if defined(CLIENT_ONLY)
.if !defined(NOPORTDOCS)
@for dir in rfc drafts; do \
diff -u net/openldap22-server/Makefile.orig net/openldap22-server/Makefile
--- net/openldap22-server/Makefile.orig Sun Jul 13 14:05:55 2003
+++ net/openldap22-server/Makefile Thu Jul 17 21:29:06 2003
@@ -45,9 +45,11 @@
.if defined(CLIENT_ONLY)
OPENLDAP_PORTVERSION= 0
OPENLDAP_PKGNAMESUFFIX?=-client
+OPENLDAP_PKGFILESUFX?= .client
.else
OPENLDAP_PORTVERSION= 0
OPENLDAP_PKGNAMESUFFIX?=-server
+OPENLDAP_PKGFILESUFX?=
LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap22-client
.endif
@@ -56,7 +58,7 @@
USE_REINPLACE= yes
USE_LIBTOOL_VER= 14
-DESCR= ${.CURDIR}/pkg-descr
+DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
PLIST= ${WRKDIR}/pkg-plist
PKGINSTALL= ${WRKDIR}/pkg-install
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -168,7 +170,7 @@
.include <bsd.port.pre.mk>
.if defined(CLIENT_ONLY)
-.include "${.CURDIR}/files/manpages"
+.include "${FILESDIR}/manpages"
.endif
pre-everything::
@@ -204,7 +206,10 @@
@${SED} ${SED_SCRIPT} ${FILESDIR}/${script} >${WRKDIR}/${script}
.endfor
.for text in pkg-install pkg-message
- @${SED} ${SED_SCRIPT} ${.CURDIR}/${text} >${WRKDIR}/${text}
+ @if [ -f ${MASTERDIR}/${text}${OPENLDAP_PKGFILESUFX} ]; then \
+ ${SED} ${SED_SCRIPT} ${MASTERDIR}/${text}${OPENLDAP_PKGFILESUFX} \
+ >${WRKDIR}/${text}; \
+ fi
.endfor
.if !defined(CLIENT_ONLY)
@@ -214,7 +219,7 @@
.endif
pre-install:
- @${CP} ${.CURDIR}/pkg-plist ${PLIST}
+ @${CP} ${MASTERDIR}/pkg-plist${OPENLDAP_PKGFILESUFX} ${PLIST}
.if defined(CLIENT_ONLY)
.if !defined(NOPORTDOCS)
@for dir in rfc drafts; do \
--- openldap-cleanup.patch ends here ---
Or get the new ports from
ftp://ftp.fillmore-labs.com/pub/FreeBSD/patches/openldap-split.tar.bz2
Size 131908 bytes, md5 = 3c66ef35c70c3edb0d2220fa5466e882
Thanks
Oliver
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200307171950.h6HJoJr7071167>