pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/ldapsdk pkglint cleanup:
details: https://anonhg.NetBSD.org/pkgsrc/rev/26524abbb7b4
branches: trunk
changeset: 526117:26524abbb7b4
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Mar 01 17:19:10 2007 +0000
description:
pkglint cleanup:
Replace scripts/* with variables/targets that do the same.
diffstat:
devel/ldapsdk/Makefile | 35 +++++++++++++++++++++++++++--------
devel/ldapsdk/scripts/pre-build | 15 ---------------
devel/ldapsdk/scripts/pre-install | 26 --------------------------
3 files changed, 27 insertions(+), 49 deletions(-)
diffs (105 lines):
diff -r ee91ead9ee6e -r 26524abbb7b4 devel/ldapsdk/Makefile
--- a/devel/ldapsdk/Makefile Thu Mar 01 17:09:00 2007 +0000
+++ b/devel/ldapsdk/Makefile Thu Mar 01 17:19:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/05/31 19:09:15 ghen Exp $
+# $NetBSD: Makefile,v 1.24 2007/03/01 17:19:10 wiz Exp $
DISTNAME= ldapsdk_12311998
PKGNAME= ${DISTNAME:S/_/-/}
@@ -18,9 +18,11 @@
PKG_SYSCONFSUBDIR= ldapsdk
EGDIR= ${PREFIX}/share/examples/ldapsdk
-SCRIPTS_ENV+= EGDIR=${EGDIR}
-SCRIPTS_ENV+= GMAKE=${GMAKE}
-SCRIPTS_ENV+= LN=${LN}
+MAKE_ENV+= MOZILLA_CLIENT=1
+MAKE_ENV+= NO_MDUPDATE=1
+MAKE_ENV+= MOZ_LDAP_SDK=1
+MAKE_FILE= directory/ldapsdk.mk
+BUILD_TARGET= build
post-extract:
${LN} -s FreeBSD.mk ${WRKSRC}/config/DragonFly.mk
@@ -29,10 +31,27 @@
${ECHO} "PKG_SYSCONFDIR=${PKG_SYSCONFDIR}" >> ${WRKSRC}/config/rules.mk
${ECHO} "EGDIR=${EGDIR}" >> ${WRKSRC}/config/rules.mk
-do-build:
- cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/pre-build
-
do-install:
- cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/pre-install
+ cd ${WRKSRC}/dist && \
+ for i in disptmpl.h lber.h ldap.h srchpref.h; \
+ do \
+ ${INSTALL_DATA} public/ldap/$$i ${PREFIX}/include; \
+ done
+ #
+ # XXX kludge
+ #
+ ${INSTALL_DATA} ${WRKSRC}/dist/${OPSYS}*/lib/libldap.a ${PREFIX}/lib/libldap.a
+ ${INSTALL_DATA} ${WRKSRC}/dist/${OPSYS}*/lib/liblber.a ${PREFIX}/lib/liblber.a
+ ${INSTALL_LIB} ${WRKSRC}/dist/${OPSYS}*/bin/libldap.so.1.0 ${PREFIX}/lib/libldap.so.1.0
+ ${LN} -sf libldap.so.1.0 ${PREFIX}/lib/libldap.so.1
+ ${LN} -sf libldap.so.1.0 ${PREFIX}/lib/libldap.so
+ ${INSTALL_LIB} ${WRKSRC}/dist/${OPSYS}*/bin/liblber.so.1.0 ${PREFIX}/lib/liblber.so.1.0
+ ${LN} -sf liblber.so.1.0 ${PREFIX}/lib/liblber.so.1
+ ${LN} -sf liblber.so.1.0 ${PREFIX}/lib/liblber.so
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/dist/${OPSYS}*/etc/ldapfilter.conf ${EGDIR}/ldapfilter.conf
+ ${INSTALL_DATA} ${WRKSRC}/dist/${OPSYS}*/etc/ldapsearchprefs.conf ${EGDIR}/ldapsearchprefs.conf
+ ${INSTALL_DATA} ${WRKSRC}/dist/${OPSYS}*/etc/ldapfriendly ${EGDIR}/ldapfriendly
+ ${INSTALL_DATA} ${WRKSRC}/dist/${OPSYS}*/etc/ldaptemplates.conf ${EGDIR}/ldaptemplates.conf
.include "../../mk/bsd.pkg.mk"
diff -r ee91ead9ee6e -r 26524abbb7b4 devel/ldapsdk/scripts/pre-build
--- a/devel/ldapsdk/scripts/pre-build Thu Mar 01 17:09:00 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-# $NetBSD: pre-build,v 1.3 2002/10/20 21:48:18 seb Exp $
-
-cd ${WRKSRC}
-
-MOZILLA_CLIENT=1
-NO_MDUPDATE=1
-MOZ_LDAP_SDK=1
-export MOZILLA_CLIENT NO_MDUPDATE MOZ_LDAP_SDK
-unset MOZ_LI
-unset MOZ_LITE
-unset MOZ_MEDIUM
-unset NO_SECURITY
-
-${GMAKE} -f directory/ldapsdk.mk build
diff -r ee91ead9ee6e -r 26524abbb7b4 devel/ldapsdk/scripts/pre-install
--- a/devel/ldapsdk/scripts/pre-install Thu Mar 01 17:09:00 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#!/bin/sh
-# $NetBSD: pre-install,v 1.6 2006/01/15 18:10:23 joerg Exp $
-
-cd ${WRKSRC}
-cd dist
-for i in disptmpl.h lber.h ldap.h srchpref.h
-do
- ${BSD_INSTALL_DATA} public/ldap/$i ${PREFIX}/include
-done
-#
-# XXX kludge
-#
-cd ${OPSYS}*
-${BSD_INSTALL_DATA} lib/libldap.a ${PREFIX}/lib/libldap.a
-${BSD_INSTALL_DATA} lib/liblber.a ${PREFIX}/lib/liblber.a
-${BSD_INSTALL_LIB} bin/libldap.so.1.0 ${PREFIX}/lib/libldap.so.1.0
-${LN} -sf libldap.so.1.0 ${PREFIX}/lib/libldap.so.1
-${LN} -sf libldap.so.1.0 ${PREFIX}/lib/libldap.so
-${BSD_INSTALL_LIB} bin/liblber.so.1.0 ${PREFIX}/lib/liblber.so.1.0
-${LN} -sf liblber.so.1.0 ${PREFIX}/lib/liblber.so.1
-${LN} -sf liblber.so.1.0 ${PREFIX}/lib/liblber.so
-${BSD_INSTALL_DATA_DIR} ${EGDIR}
-${BSD_INSTALL_DATA} etc/ldapfilter.conf ${EGDIR}/ldapfilter.conf
-${BSD_INSTALL_DATA} etc/ldapsearchprefs.conf ${EGDIR}/ldapsearchprefs.conf
-${BSD_INSTALL_DATA} etc/ldapfriendly ${EGDIR}/ldapfriendly
-${BSD_INSTALL_DATA} etc/ldaptemplates.conf ${EGDIR}/ldaptemplates.conf
Home |
Main Index |
Thread Index |
Old Index