[Midnightbsd-cvs] mports [20045] trunk/net/openldap24-server: fix plist

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Aug 26 12:08:23 EDT 2015 

Revision: 20045
          http://svnweb.midnightbsd.org/mports/?rev=20045
Author:   laffer1
Date:     2015-08-26 12:08:22 -0400 (Wed, 26 Aug 2015)
Log Message:
-----------
fix plist

Modified Paths:
--------------
    trunk/net/openldap24-server/Makefile
    trunk/net/openldap24-server/pkg-plist
    trunk/net/openldap24-server/pkg-plist.client

Modified: trunk/net/openldap24-server/Makefile
===================================================================
--- trunk/net/openldap24-server/Makefile	2015-08-26 12:04:30 UTC (rev 20044)
+++ trunk/net/openldap24-server/Makefile	2015-08-26 16:08:22 UTC (rev 20045)
@@ -516,12 +516,6 @@
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 
-pre-configure:
-	@if [ -n "`${PKG_INFO} -xI '^bind\(84\)\{0,1\}-base-8\.' 2>/dev/null`" ]; then \
-		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
-		${FALSE}; \
-	fi
-
 .if !defined(CLIENT_ONLY)
 test: build
 	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
@@ -543,40 +537,40 @@
 
 pre-install:
 .if !defined(CLIENT_ONLY)
-	@${MKDIR} ${STAGEDIR}${DATABASEDIR}
+	@${MKDIR} ${FAKE_DESTDIR}${DATABASEDIR}
 .endif
 
 post-install:
 .if defined(CLIENT_ONLY)
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
 	@for dir in drafts rfc; do \
-		${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \
-		${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${STAGEDIR}${DOCSDIR}/$${dir}; \
+		${MKDIR} ${DOCSDIR}/$${dir}; \
+		${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${DOCSDIR}/$${dir}; \
 	done
 	@for prog in ldapcompare ldapdelete ldapexop ldapmodify ldapmodrdn ldappasswd ldapsearch ldapurl ldapwhoami; do\
-		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$${prog}; \
+		${STRIP_CMD} ${PREFIX}/bin/$${prog}; \
 	done
 
 	@for library in lber ldap ldap_r; do \
-		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \
+		${STRIP_CMD} }${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \
 	done
 .else
-	@${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR}
+	@${MKDIR} ${FAKE_DESTDIR}${LDAP_RUN_DIR}
 .if ${PORT_OPTIONS:MSMBPWD}
 	@(cd ${WRKSRC}/contrib/slapd-modules/smbk5pwd && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} prefix="${PREFIX}" install)
-	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/smbk5pwd.a
+	${RM} ${PREFIX}/libexec/openldap/smbk5pwd.a
 .endif
 .if ${PORT_OPTIONS:MSHA2}
 	@(cd ${WRKSRC}/contrib/slapd-modules/passwd/sha2 && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} prefix="${PREFIX}" install)
-	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-sha2.a
+	${RM} ${PREFIX}/libexec/openldap/pw-sha2.a
 .endif
 .if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSMBPWD} || ${PORT_OPTIONS:MSHA2}
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so
+	@${STRIP_CMD} ${PREFIX}/libexec/openldap/*.so
 .endif
 .endif # defined(CLIENT_ONLY)
 

Modified: trunk/net/openldap24-server/pkg-plist
===================================================================
--- trunk/net/openldap24-server/pkg-plist	2015-08-26 12:04:30 UTC (rev 20044)
+++ trunk/net/openldap24-server/pkg-plist	2015-08-26 16:08:22 UTC (rev 20045)
@@ -1,34 +1,32 @@
 @unexec %%RC_DIR%%/etc/rc.d/slapd stop 2>&1 >/dev/null || true
-%%ETCDIR%%/schema/README
-%%ETCDIR%%/schema/collective.ldif
- at sample %%ETCDIR%%/schema/collective.schema.sample
-%%ETCDIR%%/schema/corba.ldif
- at sample %%ETCDIR%%/schema/corba.schema.sample
-%%ETCDIR%%/schema/core.ldif
- at sample %%ETCDIR%%/schema/core.schema.sample
-%%ETCDIR%%/schema/cosine.ldif
- at sample %%ETCDIR%%/schema/cosine.schema.sample
-%%ETCDIR%%/schema/duaconf.ldif
- at sample %%ETCDIR%%/schema/duaconf.schema.sample
-%%ETCDIR%%/schema/dyngroup.ldif
- at sample %%ETCDIR%%/schema/dyngroup.schema.sample
-%%ETCDIR%%/schema/inetorgperson.ldif
- at sample %%ETCDIR%%/schema/inetorgperson.schema.sample
-%%ETCDIR%%/schema/java.ldif
- at sample %%ETCDIR%%/schema/java.schema.sample
-%%ETCDIR%%/schema/misc.ldif
- at sample %%ETCDIR%%/schema/misc.schema.sample
-%%ETCDIR%%/schema/nis.ldif
- at sample %%ETCDIR%%/schema/nis.schema.sample
-%%ETCDIR%%/schema/openldap.ldif
- at sample %%ETCDIR%%/schema/openldap.schema.sample
-%%ETCDIR%%/schema/pmi.ldif
- at sample %%ETCDIR%%/schema/pmi.schema.sample
-%%ETCDIR%%/schema/ppolicy.ldif
- at sample %%ETCDIR%%/schema/ppolicy.schema.sample
- at sample %%ETCDIR%%/slapd.conf.sample
- at sample %%ETCDIR%%/slapd.ldif.sample
-%%BACK_BDB%%%%ETCDIR%%/DB_CONFIG.example
+etc/openldap/schema/README
+etc/openldap/schema/collective.ldif
+ at sample etc/openldap/schema/collective.schema.sample
+etc/openldap/schema/corba.ldif
+ at sample etc/openldap/schema/corba.schema.sample
+etc/openldap/schema/core.ldif
+ at sample etc/openldap/schema/core.schema.sample
+etc/openldap/schema/cosine.ldif
+ at sample etc/openldap/schema/cosine.schema.sample
+etc/openldap/schema/duaconf.ldif
+ at sample etc/openldap/schema/duaconf.schema.sample
+etc/openldap/schema/dyngroup.ldif
+ at sample etc/openldap/schema/dyngroup.schema.sample
+etc/openldap/schema/inetorgperson.ldif
+ at sample etc/openldap/schema/inetorgperson.schema.sample
+etc/openldap/schema/java.ldif
+ at sample etc/openldap/schema/java.schema.sample
+etc/openldap/schema/misc.ldif
+ at sample etc/openldap/schema/misc.schema.sample
+etc/openldap/schema/nis.ldif
+ at sample etc/openldap/schema/nis.schema.sample
+etc/openldap/schema/openldap.ldif
+ at sample etc/openldap/schema/openldap.schema.sample
+etc/openldap/schema/pmi.ldif
+ at sample etc/openldap/schema/pmi.schema.sample
+etc/openldap/schema/ppolicy.ldif
+ at sample etc/openldap/schema/ppolicy.schema.sample
+%%BACK_BDB%%etc/DB_CONFIG.example
 %%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%SLAPI%%lib/libslapi.a
@@ -163,7 +161,7 @@
 sbin/slappasswd
 sbin/slapschema
 sbin/slaptest
- at dir %%ETCDIR%%/schema
+ at dir etc/schema
 %%MODULES%%@dir libexec/openldap
 @dir(%%LDAP_USER%%,%%LDAP_GROUP%%,775) %%LDAP_RUN_DIR%%
 @dir(%%LDAP_USER%%,%%LDAP_GROUP%%,775) %%DATABASEDIR%%

Modified: trunk/net/openldap24-server/pkg-plist.client
===================================================================
--- trunk/net/openldap24-server/pkg-plist.client	2015-08-26 12:04:30 UTC (rev 20044)
+++ trunk/net/openldap24-server/pkg-plist.client	2015-08-26 16:08:22 UTC (rev 20045)
@@ -8,7 +8,6 @@
 bin/ldapsearch
 bin/ldapurl
 bin/ldapwhoami
- at sample %%ETCDIR%%/ldap.conf.sample
 include/lber.h
 include/lber_types.h
 include/ldap.h

More information about the Midnightbsd-cvs mailing list