diff options
| author | adam <adam@pkgsrc.org> | 2011-01-05 07:28:19 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2011-01-05 07:28:19 +0000 |
| commit | 9c040be97600427376f3edb409c695090b2ef943 (patch) | |
| tree | 60776e264c32f938afed71a4dc658017a7fa98ea /security/dirmngr | |
| parent | 1f6b73b65793914d6e16f4b5c0977b5576b6913e (diff) | |
| download | pkgsrc-9c040be97600427376f3edb409c695090b2ef943.tar.gz | |
Change the order in which LDAP libraries are detected; fixes building on Mac OS X and probably other machines. pkglint clean-up.
Diffstat (limited to 'security/dirmngr')
| -rw-r--r-- | security/dirmngr/Makefile | 18 | ||||
| -rw-r--r-- | security/dirmngr/distinfo | 3 | ||||
| -rw-r--r-- | security/dirmngr/patches/patch-ab | 13 |
3 files changed, 24 insertions, 10 deletions
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile index 0468c7dcb4d..db9877306a3 100644 --- a/security/dirmngr/Makefile +++ b/security/dirmngr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2010/09/01 16:40:53 drochner Exp $ +# $NetBSD: Makefile,v 1.37 2011/01/05 07:28:19 adam Exp $ # DISTNAME= dirmngr-1.1.0 @@ -32,17 +32,17 @@ USE_PKGLOCALEDIR= yes RCD_SCRIPTS= dirmngr INFO_FILES= YES -CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} -CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --sharedstatedir=${VARBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --datadir=${PREFIX}/libdata CONFIGURE_ENV+= BUILDLINK_PREFIX_openldap-client=${BUILDLINK_PREFIX.openldap-client} -FILES_SUBST+= VARBASE=${VARBASE:Q} -FILES_SUBST+= PREFIX=${PREFIX:Q} -FILES_SUBST+= SYSCONFDIR=${SYSCONFDIR:Q} -FILES_SUBST+= DIRMNGR_USER=${DIRMNGR_USER:Q} -FILES_SUBST+= DIRMNGR_GROUP=${DIRMNGR_GROUP:Q} +FILES_SUBST+= VARBASE=${VARBASE} +FILES_SUBST+= PREFIX=${PREFIX} +FILES_SUBST+= SYSCONFDIR=${SYSCONFDIR} +FILES_SUBST+= DIRMNGR_USER=${DIRMNGR_USER} +FILES_SUBST+= DIRMNGR_GROUP=${DIRMNGR_GROUP} FILES_SUBST+= DIRMNGR_PATH=${DIRMNGR_PATH:Q} OWN_DIRS+= ${PKG_SYSCONFDIR}/dirmngr diff --git a/security/dirmngr/distinfo b/security/dirmngr/distinfo index d06c6d7efe8..047bbbf9e88 100644 --- a/security/dirmngr/distinfo +++ b/security/dirmngr/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.16 2010/09/01 16:40:53 drochner Exp $ +$NetBSD: distinfo,v 1.17 2011/01/05 07:28:19 adam Exp $ SHA1 (dirmngr-1.1.0.tar.bz2) = a7a7d1432db9edad2783ea1bce761a8106464165 RMD160 (dirmngr-1.1.0.tar.bz2) = 2f67ad8668cf4aa4a2ec2c1fa857d9225ec01a65 Size (dirmngr-1.1.0.tar.bz2) = 556406 bytes SHA1 (patch-aa) = bbc030ab815f6fbbcc440768c3a73ab0f74ba2f0 +SHA1 (patch-ab) = d28f1d4a2062e2207d02d9989e7e708f7a44acc0 SHA1 (patch-ac) = 1f611619771e9c5258037e2f97855e9a9513a135 SHA1 (patch-ad) = 94c789bd308208c147a24f05b371602ec74185f4 SHA1 (patch-ae) = 3d77aff4b2ee779106dee329f3a6cd5b8f332e26 diff --git a/security/dirmngr/patches/patch-ab b/security/dirmngr/patches/patch-ab new file mode 100644 index 00000000000..b84825536c5 --- /dev/null +++ b/security/dirmngr/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.8 2011/01/05 07:28:20 adam Exp $ + +--- configure.orig 2011-01-05 07:14:41.000000000 +0000 ++++ configure +@@ -8608,7 +8608,7 @@ fi + # guess-the-dependency by using something like ./configure + # LDAPLIBS="-Lfoo -lbar" + # +-for MY_LDAPLIBS in ${LDAPLIBS+"$LDAPLIBS"} "-lldap" "-lldap -llber" "-lldap -llber -lresolv" "-lwldap32"; do ++for MY_LDAPLIBS in ${LDAPLIBS+"$LDAPLIBS"} "-lldap -llber" "-lldap" "-lldap -llber -lresolv" "-lwldap32"; do + _ldap_save_libs=$LIBS + LIBS="$MY_LDAPLIBS $NETLIBS $LIBS" + |