Libtoolize security/PAM so that the appropriate options are passed to

the compiler to build shared modules, and so that it builds correctly
across different platforms.  Bump the PKGREVISION.

In particular, this should fix problems building this package on
NetBSD/amd64.

1 files changed, 84 insertions, 12 deletions

diff --git a/security/PAM/patches/patch-ah b/security/PAM/patches/patch-ah
index de584276bd5..c985965900e 100644
--- a/security/PAM/patches/patch-ah
+++ b/security/PAM/patches/patch-ah
@@ -1,22 +1,94 @@
-$NetBSD: patch-ah,v 1.4 2002/12/23 21:23:59 jlam Exp $
+$NetBSD: patch-ah,v 1.5 2004/11/16 07:46:57 jlam Exp $
 
---- modules/Simple.Rules.orig	Sun Dec  9 17:15:11 2001
+--- modules/Simple.Rules.orig	2001-12-09 17:15:11.000000000 -0500
 +++ modules/Simple.Rules
-@@ -59,7 +59,7 @@ endif
+@@ -18,8 +18,13 @@ LIBSRC = $(addsuffix .c,$(LIBFILES))
+ LIBOBJ = $(addsuffix .o,$(LIBFILES))
+ LIBOBJD = $(addprefix dynamic/,$(LIBOBJ))
+ LIBOBJS = $(addprefix static/,$(LIBOBJ))
++LIBOBJLA = $(LIBOBJ:.o=.lo)
  
- ifdef DYNAMIC
- $(LIBSHARED):	$(LIBOBJD)
--	$(LD_D) -o $@ $(LIBOBJD) $(MODULE_SIMPLE_EXTRALIBS) $(NEED_LINK_LIB_C) $(LINK_PAMMODUTILS)
-+	$(LD_D) $(LDFLAGS) -o $@ $(LIBOBJD) $(MODULE_SIMPLE_EXTRALIBS) $(NEED_LINK_LIB_C) $(LINK_PAMMODUTILS)
++ifdef LIBTOOL
++LINK_PAMMODUTILS = ../pammodutil/libpammodutil.la
++else
+ LINK_PAMMODUTILS = -L../pammodutil -lpammodutil
++endif
+ INCLUDE_PAMMODUTILS = -I../pammodutil/include
  
+ ifdef DYNAMIC
+@@ -30,9 +35,23 @@ ifdef STATIC
+ LIBSTATIC = lib$(TITLE).o
  endif
  
-@@ -69,7 +69,7 @@ endif
++ifdef LIBTOOL
++LIBLIBTOOL = $(TITLE).la
++endif
++
+ ####################### don't edit below #######################
+ 
+-all: dirs $(LIBSHARED) $(LIBSTATIC) register
++ifdef DYNAMIC
++MODULES_TO_BUILD+=	$(LIBSHARED)
++endif
++ifdef STATIC
++MODULES_TO_BUILD+=	$(LIBSTATIC)
++endif
++ifdef LIBTOOL
++MODULES_TO_BUILD+=	$(LIBLIBTOOL)
++endif
++
++all: dirs $(MODULES_TO_BUILD) register
  
- ifdef STATIC
- $(LIBSTATIC): $(LIBOBJS)
--	$(LD) -r -o $@ $(LIBOBJS) $(MODULE_SIMPLE_EXTRALIBS) $(LINK_PAMMODUTILS)
-+	$(LD) $(LDFLAGS) -r -o $@ $(LIBOBJS) $(MODULE_SIMPLE_EXTRALIBS) $(LINK_PAMMODUTILS)
+ dynamic/%.o : %.c
+ 	$(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) $(DYNAMIC) $(TARGET_ARCH) -c $< -o $@
+@@ -40,6 +59,9 @@ dynamic/%.o : %.c
+ static/%.o : %.c
+ 	$(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) $(STATIC) $(TARGET_ARCH) -c $< -o $@
+ 
++%.lo : %.c
++	$(SHLIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) -DPAM_DYNAMIC $(TARGET_ARCH) -c $<
++
+ dirs:
+ ifdef DYNAMIC
+ 	$(MKDIR) ./dynamic
+@@ -72,22 +94,37 @@ $(LIBSTATIC): $(LIBOBJS)
+ 	$(LD) -r -o $@ $(LIBOBJS) $(MODULE_SIMPLE_EXTRALIBS) $(LINK_PAMMODUTILS)
  endif
  
++ifdef LIBTOOL
++$(LIBOBJLA): $(LIBSRC)
++endif
++
++ifdef LIBTOOL
++$(LIBLIBTOOL): $(LIBOBJLA)
++	$(SHLIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LIBOBJLA) -o $@ $(MODULE_SIMPLE_EXTRALIBS) $(NEED_LINK_LIB_C) $(LINK_PAMMODUTILS) -module -avoid-version -rpath $(FAKEROOT)$(SECUREDIR)
++endif
++
  install: all
+ 	$(MKDIR) $(FAKEROOT)$(SECUREDIR)
+ ifdef DYNAMIC
+ 	$(INSTALL) -m $(SHLIBMODE) $(LIBSHARED) $(FAKEROOT)$(SECUREDIR)
+ endif
++ifdef LIBTOOL
++	$(SHLIBTOOL) --mode=install $(INSTALL) -c $(LIBLIBTOOL) $(FAKEROOT)$(SECUREDIR)
++endif
+ 	$(MODULE_SIMPLE_INSTALL)
+ 
+ remove:
+ 	rm -f $(FAKEROOT)$(SECUREDIR)/$(TITLE).so
++ifdef LIBTOOL
++	$(SHLIBTOOL) --mode=uninstall rm $(FAKEROOT)$(SECUREDIR)/$(TITLE).la
++endif
+ 	$(MODULE_SIMPLE_REMOVE)
+ 
+ clean:
+-	rm -f $(LIBOBJD) $(LIBOBJS) core *~
++	rm -f $(LIBOBJD) $(LIBOBJS) $(LIBOBJLA) core *~
+ 	$(MODULE_SIMPLE_CLEAN)
+-	rm -f *.a *.o *.so *.bak
+-	rm -rf dynamic static
++	rm -f *.a *.la *.lo *.o *.so *.bak
++	rm -rf dynamic static .libs
+ 	$(MODULE_SIMPLE_EXTRACLEAN)
+ 
+ .c.o: