3 files changed, 14 insertions, 20 deletions
diff --git a/security/openpam/patches/patch-aa b/security/openpam/patches/patch-aa
deleted file mode 100644
index a35353ea4ca..00000000000
--- a/security/openpam/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/09/06 18:56:25 joerg Exp $
-
---- config.h.in.orig	2007-09-06 20:48:16.000000000 +0200
-+++ config.h.in
-@@ -43,7 +43,9 @@
- #undef LIB_MAJ
- 
- /* OpenPAM modules directory */
-+#ifndef OPENPAM_MODULES_DIR
- #undef OPENPAM_MODULES_DIR
-+#endif
- 
- /* Name of package */
- #undef PACKAGE
diff --git a/security/openpam/patches/patch-ab b/security/openpam/patches/patch-ab
index 72828eca9e8..023ae22ce0b 100644
--- a/security/openpam/patches/patch-ab
+++ b/security/openpam/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/01/13 21:51:08 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2008/02/18 16:48:12 jlam Exp $
 
---- lib/openpam_configure.c.orig	2004-02-09 18:00:00.000000000 -0500
+--- lib/openpam_configure.c.orig	2007-12-21 06:36:24.000000000 -0500
 +++ lib/openpam_configure.c
-@@ -262,11 +262,13 @@ openpam_read_chain(pam_handle_t *pamh,
+@@ -263,11 +263,13 @@ openpam_read_chain(pam_handle_t *pamh,
  	return (-1);
  }
  
diff --git a/security/openpam/patches/patch-ac b/security/openpam/patches/patch-ac
index 27a1b4af939..6675d31960b 100644
--- a/security/openpam/patches/patch-ac
+++ b/security/openpam/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2005/02/10 02:55:39 jlam Exp $
+$NetBSD: patch-ac,v 1.3 2008/02/18 16:48:12 jlam Exp $
 
---- lib/Makefile.in.orig	2005-01-31 18:00:00.000000000 -0500
+--- lib/Makefile.in.orig	2007-12-21 06:44:28.000000000 -0500
 +++ lib/Makefile.in
-@@ -137,7 +137,7 @@ CC = @CC@
+@@ -116,7 +116,7 @@ CC = @CC@
  CCDEPMODE = @CCDEPMODE@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
@@ -11,3 +11,11 @@ $NetBSD: patch-ac,v 1.2 2005/02/10 02:55:39 jlam Exp $
  CRYPT_LIBS = @CRYPT_LIBS@
  CXX = @CXX@
  CXXCPP = @CXXCPP@
+@@ -267,7 +267,6 @@ libpam_la_SOURCES = \
+ 	pam_vprompt.c \
+ 	$(NULL)
+ 
+-libpam_la_CFLAGS = -DOPENPAM_MODULES_DIR='"@OPENPAM_MODULES_DIR@/"'
+ libpam_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@ @DL_LIBS@
+ EXTRA_DIST = \
+ 	pam_authenticate_secondary.c \