Just build the shared module, but let libtool install it.

4 files changed, 48 insertions, 10 deletions

diff --git a/security/pam-p11/Makefile b/security/pam-p11/Makefile
index 5cac7f2074f..c30bbd95307 100644
--- a/security/pam-p11/Makefile
+++ b/security/pam-p11/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2013/02/06 23:23:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2013/04/01 12:23:52 joerg Exp $
 #
 
 DISTNAME=	pam_p11-0.1.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.opensc-project.org/files/pam_p11/
 
@@ -13,13 +13,13 @@ LICENSE=	gnu-lgpl-v2.1
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake pkg-config autoconf automake
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf -f
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/libp11/buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pam-p11/PLIST b/security/pam-p11/PLIST
index e50d7e54204..5469ee69113 100644
--- a/security/pam-p11/PLIST
+++ b/security/pam-p11/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2010/07/14 07:13:59 manu Exp $
-lib/security/pam_p11_openssh.so
-lib/security/pam_p11_opensc.so
+@comment $NetBSD: PLIST,v 1.4 2013/04/01 12:23:52 joerg Exp $
+lib/security/pam_p11_openssh.la
+lib/security/pam_p11_opensc.la
diff --git a/security/pam-p11/distinfo b/security/pam-p11/distinfo
index 5cf1c72d452..5f0ca166279 100644
--- a/security/pam-p11/distinfo
+++ b/security/pam-p11/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2010/07/14 07:13:59 manu Exp $
+$NetBSD: distinfo,v 1.4 2013/04/01 12:23:52 joerg Exp $
 
 SHA1 (pam_p11-0.1.5.tar.gz) = 4ff838140e452c84143445dcf6a3f158009b83b0
 RMD160 (pam_p11-0.1.5.tar.gz) = 57930c4b93182dd36cd2a1c81231638f813b47d2
 Size (pam_p11-0.1.5.tar.gz) = 348181 bytes
 SHA1 (patch-aa) = c82f6de3fdb094601f5250280c7a5727d41d983d
 SHA1 (patch-ab) = 701f8e878f928c98f0037b363099f9c12ece429e
+SHA1 (patch-src_Makefile.am) = b9b9883552a4e0f01f78473c22e97534d075f05e
diff --git a/security/pam-p11/patches/patch-src_Makefile.am b/security/pam-p11/patches/patch-src_Makefile.am
new file mode 100644
index 00000000000..5cfa4159be8
--- /dev/null
+++ b/security/pam-p11/patches/patch-src_Makefile.am
@@ -0,0 +1,37 @@
+$NetBSD: patch-src_Makefile.am,v 1.1 2013/04/01 12:23:52 joerg Exp $
+
+--- src/Makefile.am.orig	2008-07-31 13:23:47.000000000 +0000
++++ src/Makefile.am
+@@ -3,7 +3,7 @@
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+ AM_CFLAGS = -Wall -fno-strict-aliasing $(OPENSSL_CFLAGS) $(LIBP11_CFLAGS)
+-AM_LDFLAGS = -module -avoid-version
++AM_LDFLAGS = -module -avoid-version -shared
+ 
+ lib_LTLIBRARIES = pam_p11_openssh.la  pam_p11_opensc.la 
+ 
+@@ -13,7 +13,7 @@ pam_p11_openssh_la_LIBADD = $(OPENSSL_LI
+ pam_p11_opensc_la_SOURCES =  pam_p11.c match_opensc.c
+ pam_p11_opensc_la_LIBADD = $(OPENSSL_LIBS) $(LIBP11_LIBS) 
+ 
+-noinst_PROGRAMS= test
++noinst_PROGRAMS=
+ 
+ test_SOURCES=test.c
+ test_LDADD=pam_p11_openssh.la
+@@ -21,12 +21,5 @@ test_LDADD=pam_p11_openssh.la
+ format:
+ 	indent -kr -i8 -ts8 -sob -l80 -ss -ncs *.c *.h
+ 
+-install:       
+-	$(mkinstalldirs) $(DESTDIR)/$(libdir)/security
+-	$(libLTLIBRARIES_INSTALL) $(top_builddir)/src/.libs/pam_p11_openssh.so $(DESTDIR)/$(libdir)/security
+-	$(libLTLIBRARIES_INSTALL) $(top_builddir)/src/.libs/pam_p11_opensc.so $(DESTDIR)/$(libdir)/security
+-
+-uninstall:       
+-	$(RM) $(DESTDIR)/$(libdir)/security/pam_p11_openssh.so 
+-	$(RM) $(DESTDIR)/$(libdir)/security/pam_p11_opensc.so 
+-	@ rmdir $(DESTDIR)/$(libdir)/security
++libdir = @libdir@/security
++