pkg/46645: Fix destdir support for www/ap22-vhost-ldap, update to 2.0.8

[bartosz.kuzma%gmail.com@localhost]

>Number:         46645
>Category:       pkg
>Synopsis:       Fix destdir support for www/ap22-vhost-ldap, update to 2.0.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jul 01 09:50:00 +0000 2012
>Originator:     Bartosz Kuzma
>Release:        NetBSD 6.0_BETA2
>Organization:
>Environment:
>Description:
www/ap22-vhost-ldap install files directly to /usr/pkg. E.g: 


=> Unwrapping files-to-be-installed.
===> Installing for ap22-vhost-ldap-1.2.0nb2
=> Creating installation directories from PLIST files
cd /usr/pkgsrc/www/ap22-vhost-ldap/work/mod-vhost-ldap-1.2.0 &&                 
                                         /usr/pkg/sbin/apxs -i -n 
mod_vhost_ldap mod_vhost_ldap.la
/usr/pkg/share/httpd/build/instdso.sh SH_LIBTOOL='/usr/pkg/libexec/apr/libtool' 
mod_vhost_ldap.la /usr/pkg/lib/httpd
/usr/pkg/libexec/apr/libtool --mode=install cp mod_vhost_ldap.la 
/usr/pkg/lib/httpd/
libtool: install: cp .libs/mod_vhost_ldap.so 
/usr/pkg/lib/httpd/mod_vhost_ldap.so
libtool: install: cp .libs/mod_vhost_ldap.lai 
/usr/pkg/lib/httpd/mod_vhost_ldap.la
libtool: install: cp .libs/mod_vhost_ldap.a /usr/pkg/lib/httpd/mod_vhost_ldap.a
libtool: install: chmod 644 /usr/pkg/lib/httpd/mod_vhost_ldap.a
libtool: install: ranlib /usr/pkg/lib/httpd/mod_vhost_ldap.a

The following patch fix destdir support and update package to 2.0.8.

Changes since 1.2.0:

2011-06-20 Ondrej Sury <ondrej%sury.org@localhost>
        * VERSION: 2.0.8
        * mod_vhost_ldap.c: Don't copy server struct if we have per request 
document root

2011-03-18 Ondrej Sury <ondrej%sury.org@localhost>
        * VERSION: 2.0.7
        * mod_vhost_ldap.c: Revert escaping wildcard character as it was
                            already done before by ldap_bv2escaped_filter_value
2011-03-17 Ondrej Sury <ondrej%sury.org@localhost>
        * VERSION: 2.0.6
        * mod_vhost_ldap.c: Properly escape wildcard string to search
                            for literal *.hostname
        * mod_vhost_ldap.c, vhost_ldap.conf: Add new boolean option 
VhostLDAPWildcard
                                             to disable wildcard search 
completely
        * mod_vhost_ldap.c: Fix cgi-bin processing (Courtesy of Anders Kaseorg)
        
2010-07-07 Ondrej Sury <ondrej%sury.org@localhost>
        * VERSION: 2.0.5
        * mod_vhost_ldap.c: Make a private copy of server config to each
                            request to be thread safe. (Courtesy Anders Kaseorg)

2010-06-16 Ondrej Sury <ondrej%sury.org@localhost>
        * VERSION: 2.0.3
        * mod_vhost_ldap.c: Workaround concurrency issues with ap_document_root
                            by adding mutex before it is set and release before
                            handler is run.

2010-06-09 Ondrej Sury <ondrej%sury.org@localhost>
        * VERSION: 2.0.1
        * mod_vhost_ldap.c: Remove cleanup routine, it was causing segfaults.

2010-06-08 Ondrej Sury <ondrej%sury.org@localhost>
        * VERSION: 2.0.0 release
        * mod_vhost_ldap.c: Sleep for (fibonacci numbers) seconds after LDAP 
failure
        * mod_vhost_ldap.c: Add a log WARNING when LDAP is unreachable
        * mod_vhost_ldap.c: Don't set r->filename, return DECLINE on success, 
only
                            mangle documentroot and others, and let other apache
                            modules handle real filenames
        * mod_vhost_ldap.c: Create and use function set_document_root inspired 
by apache2.2
        * mod_vhost_ldap.c: Return correct error codes on failures and not 
DECLINED
        * mod_vhost_ldap.c: Put translate_name hook at FIRST place
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap22-vhost-ldap/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile    2 Dec 2011 07:13:50 -0000       1.3
+++ Makefile    1 Jul 2012 09:37:58 -0000
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.3 2011/12/02 07:13:50 sbd Exp $
 
-MVL_VERSION=           1.2.0
+MVL_VERSION=           2.0.8
 DISTNAME=              mod-vhost-ldap_${MVL_VERSION}.orig
 PKGNAME=               ${APACHE_PKG_PREFIX}-vhost-ldap-${MVL_VERSION}
-PKGREVISION=           2
+PKGREVISION=
 CATEGORIES=            www databases
 MASTER_SITES=          ${MASTER_SITE_DEBIAN:=pool/main/m/mod-vhost-ldap/}
 
@@ -32,8 +32,10 @@
                -lldap_r mod_vhost_ldap.c
 
 do-install:
+       libexecdir=`${APXS} -q LIBEXECDIR` &&                                   
\
        cd ${WRKSRC} &&                                                         
\
-       ${APXS} -i -n ${APACHE_MODULE_NAME} ${APACHE_MODULE_NAME}.la
+       ${APXS} -i -S LIBEXECDIR=${DESTDIR}"$${libexecdir}"                     
\
+               -n ${APACHE_MODULE_NAME} ${APACHE_MODULE_NAME}.la
        ${INSTALL_DATA} ${WRKSRC}/vhost_ldap.conf                               
\
                ${DESTDIR}${PREFIX}/share/examples/mod_vhost_ldap
        ${INSTALL_DATA} ${WRKSRC}/mod_vhost_ldap.schema                         
\
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap22-vhost-ldap/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo    21 Feb 2009 15:59:20 -0000      1.1.1.1
+++ distinfo    1 Jul 2012 09:37:58 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.1.1.1 2009/02/21 15:59:20 imil Exp $
 
-SHA1 (mod-vhost-ldap_1.2.0.orig.tar.gz) = 
5152a928bdee6f6e9e3a2e02dc20ef3de24528d4
-RMD160 (mod-vhost-ldap_1.2.0.orig.tar.gz) = 
b4bcd45d4fab70acc69e1a65a3f3f94447591889
-Size (mod-vhost-ldap_1.2.0.orig.tar.gz) = 8593 bytes
+SHA1 (mod-vhost-ldap_2.0.8.orig.tar.gz) = 
b1b0b34adebc4c001c4db8c3991a09912c636145
+RMD160 (mod-vhost-ldap_2.0.8.orig.tar.gz) = 
23a06ee88b99e26048c073e99b17688720504037
+Size (mod-vhost-ldap_2.0.8.orig.tar.gz) = 10395 bytes