Wed Mar 21 18:24:00 2012 UTC ()
Fix build on SunOS with gcc by replacing sunpro arguments with their gcc
counterparts. The wrappers will replace them again for sunpro builds.


(hans)
diff -r1.7 -r1.8 pkgsrc/security/pam-af/distinfo
diff -r1.3 -r1.4 pkgsrc/security/pam-af/patches/patch-aa
cvs diff -r1.7 -r1.8 pkgsrc/security/pam-af/distinfo (expand / switch to unified diff)

--- pkgsrc/security/pam-af/distinfo 2011/10/17 08:47:51 1.7
+++ pkgsrc/security/pam-af/distinfo 2012/03/21 18:24:00 1.8
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.7 2011/10/17 08:47:51 obache Exp $ 1$NetBSD: distinfo,v 1.8 2012/03/21 18:24:00 hans Exp $
2 2
3SHA1 (pam_af-1.0.2.tar.bz2) = e3856a33d79beafa8d4e8cb44b19cbf79a3ed422 3SHA1 (pam_af-1.0.2.tar.bz2) = e3856a33d79beafa8d4e8cb44b19cbf79a3ed422
4RMD160 (pam_af-1.0.2.tar.bz2) = 0c4163d811ba83de32e9b4633780ac76c8d10d8f 4RMD160 (pam_af-1.0.2.tar.bz2) = 0c4163d811ba83de32e9b4633780ac76c8d10d8f
5Size (pam_af-1.0.2.tar.bz2) = 17991 bytes 5Size (pam_af-1.0.2.tar.bz2) = 17991 bytes
6SHA1 (patch-aa) = 90efac36df429a51461b7a912f3ea0db923f630e 6SHA1 (patch-aa) = 9c8e44c7b25e268777967c742a6946abe0c80316
7SHA1 (patch-ab) = 93adab4e1a230e46f5742ecb4390ff50d96d56d5 7SHA1 (patch-ab) = 93adab4e1a230e46f5742ecb4390ff50d96d56d5
8SHA1 (patch-ad) = 0f46fecfec3b920a08e2c22c14ada368214d6a69 8SHA1 (patch-ad) = 0f46fecfec3b920a08e2c22c14ada368214d6a69
cvs diff -r1.3 -r1.4 pkgsrc/security/pam-af/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/pam-af/patches/Attic/patch-aa 2011/01/25 09:07:58 1.3
+++ pkgsrc/security/pam-af/patches/Attic/patch-aa 2012/03/21 18:24:00 1.4
@@ -1,20 +1,30 @@ @@ -1,20 +1,30 @@
1$NetBSD: patch-aa,v 1.3 2011/01/25 09:07:58 obache Exp $ 1$NetBSD: patch-aa,v 1.4 2012/03/21 18:24:00 hans Exp $
2 2
 3* use gcc flags on SunOS
3* for PKGSRC layout 4* for PKGSRC layout
4* treat *BSDs same as FreeBSD. 5* treat *BSDs same as FreeBSD.
5 6
6--- Makefile.orig 2006-11-07 00:26:58.000000000 +0000 7--- Makefile.orig 2006-11-07 00:26:58.000000000 +0000
7+++ Makefile 8+++ Makefile
 9@@ -69,7 +69,7 @@ CFLAGS = -I./common/ -DPIC
 10 CFLAGS_GCC = -O2 -Wall -Werror -Wno-format-y2k \
 11 -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch \
 12 -Wshadow -Wchar-subscripts -Winline -Wnested-externs -fPIC
 13-CFLAGS_SUN = -KPIC -xO2 -D_SUN_PAM_ -D_HAVE_USERDEFS_H_
 14+CFLAGS_SUN = -fPIC -O2 -D_SUN_PAM_ -D_HAVE_USERDEFS_H_
 15 CFLAGS_HP = -Ae +w1 +W 474,486,542 +z +O2
 16 CFLAGS_BSD = -D_HAVE_PATHS_H_ -D_HAVE_ERR_H_ -D_HAVE_GETPROGNAME_ -D_USE_MODULE_ENTRY_ -D_HAVE_SALEN_
 17 CFLAGS_GNU = -D_GNU_SOURCE -D_HAVE_PATHS_H_ -D_HAVE_ERR_H_ -D_HAVE_FLOCK_ \
8@@ -102,16 +102,16 @@ DISTTOOLMAN = pam_af_tool.8 18@@ -102,16 +102,16 @@ DISTTOOLMAN = pam_af_tool.8
9 LIBMAN = $(LIBDIR)/$(DISTLIBMAN) 19 LIBMAN = $(LIBDIR)/$(DISTLIBMAN)
10 TOOLMAN = $(TOOLDIR)/$(DISTTOOLMAN) 20 TOOLMAN = $(TOOLDIR)/$(DISTTOOLMAN)
11  21
12-SECUREDIR = /lib/security 22-SECUREDIR = /lib/security
13-SBINDIR = /sbin 23-SBINDIR = /sbin
14-MANDIR = /share/man 24-MANDIR = /share/man
15-DESTDIR = /usr/local 25-DESTDIR = /usr/local
16+SECUREDIR = ${PREFIX}/lib/security 26+SECUREDIR = ${PREFIX}/lib/security
17+SBINDIR = ${PREFIX}/sbin 27+SBINDIR = ${PREFIX}/sbin
18+MANDIR = ${PREFIX}/$(PKGMANDIR) 28+MANDIR = ${PREFIX}/$(PKGMANDIR)
19+#DESTDIR = /usr/local 29+#DESTDIR = /usr/local
20  30