[pkgsrc/trunk]: pkgsrc/x11/xscreensaver Add "pam" PKG_OPTION to x11/xscreensa...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/782760fb5e76
branches:  trunk
changeset: 499307:782760fb5e76
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Sep 18 21:31:21 2005 +0000

description:
Add "pam" PKG_OPTION to x11/xscreensaver.  Addresses part of PR pkg/31338.
Bump the PKGREVISION of x11/xscreensaver to 2.

diffstat:

 x11/xscreensaver/Makefile         |  14 ++++++++++++--
 x11/xscreensaver/distinfo         |   4 ++--
 x11/xscreensaver/patches/patch-ad |  22 ++++++++++++++++++++--
 3 files changed, 34 insertions(+), 6 deletions(-)

diffs (86 lines):

diff -r 817277416d54 -r 782760fb5e76 x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Sun Sep 18 21:19:46 2005 +0000
+++ b/x11/xscreensaver/Makefile Sun Sep 18 21:31:21 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2005/07/21 10:59:01 tron Exp $
+# $NetBSD: Makefile,v 1.76 2005/09/18 21:31:21 jlam Exp $
 
 COMMENT=       Screen saver and locker for the X window system
-PKGREVISION=   1
+PKGREVISION=   2
 
 CONFLICTS+=    xscreensaver-gnome<4.14
 # man/man1/barcode.1
@@ -14,6 +14,16 @@
 CONFIGURE_ARGS+=       --with-configdir=${PREFIX}/libexec/xscreensaver/config
 
 .include "../../textproc/libxml2/buildlink3.mk"
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.xscreensaver
+PKG_SUPPORTED_OPTIONS= pam
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpam)
+.  include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-pam
+.endif
+
 .include "../../mk/bsd.pkg.mk"
 
 .if exists(${WRKSRC}/po/ca.gmo)
diff -r 817277416d54 -r 782760fb5e76 x11/xscreensaver/distinfo
--- a/x11/xscreensaver/distinfo Sun Sep 18 21:19:46 2005 +0000
+++ b/x11/xscreensaver/distinfo Sun Sep 18 21:31:21 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2005/07/17 17:39:57 kristerw Exp $
+$NetBSD: distinfo,v 1.46 2005/09/18 21:31:21 jlam Exp $
 
 SHA1 (xscreensaver-4.22.tar.gz) = f40db41ef221f7ed42c39e77007ce05b4f846306
 RMD160 (xscreensaver-4.22.tar.gz) = bf93e368d5e6f98ba383a908708a59f1a428aece
@@ -6,7 +6,7 @@
 SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326
 SHA1 (patch-ab) = 4de956f7911ccf31f16bff41339e2678ccac1129
 SHA1 (patch-ac) = fa811462fd59c16d25f89616665e0577431328b9
-SHA1 (patch-ad) = c524e17ffe6752bff48d20c6cc9670e8005be42d
+SHA1 (patch-ad) = 026998ead7104735d0ff71eb878348010f5d20b2
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
 SHA1 (patch-af) = 2340efe0cf677a20c336570b24374d675f5cd6eb
 SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114
diff -r 817277416d54 -r 782760fb5e76 x11/xscreensaver/patches/patch-ad
--- a/x11/xscreensaver/patches/patch-ad Sun Sep 18 21:19:46 2005 +0000
+++ b/x11/xscreensaver/patches/patch-ad Sun Sep 18 21:31:21 2005 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.17 2005/06/28 10:03:14 wiz Exp $
+$NetBSD: patch-ad,v 1.18 2005/09/18 21:31:21 jlam Exp $
 
---- driver/Makefile.in.orig    2005-06-23 03:02:23.000000000 +0200
+--- driver/Makefile.in.orig    2005-06-23 01:02:23.000000000 +0000
 +++ driver/Makefile.in
+@@ -15,7 +15,7 @@ prefix               = @prefix@
+ exec_prefix   = @exec_prefix@
+ bindir                = @bindir@
+ datadir               = @datadir@
+-localedir     = $(datadir)/locale
++localedir     = /usr/pkg/share/locale
+ mandir                = @mandir@
+ libexecdir    = @libexecdir@
+ mansuffix     = 1
 @@ -222,7 +222,7 @@ HDRS               = XScreenSaver_ad.h XScreenSaver_X
                  xscreensaver.h prefs.h remote.h \
                  demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \
@@ -11,6 +20,15 @@
                  xscreensaver-command.man \
                  xscreensaver-text.man \
                  xscreensaver-getimage.man \
+@@ -253,7 +253,7 @@ all: $(EXES) $(EXES2)
+ tests: $(TEST_EXES)
+ 
+ install:   install-program   install-ad    install-scripts \
+-         install-gnome     install-man   install-xml install-pam
++         install-gnome     install-man   install-xml
+ uninstall: uninstall-program uninstall-ad  \
+          uninstall-gnome   uninstall-man uninstall-xml  
+ 
 @@ -288,7 +288,7 @@ install-program: $(EXES)
        fi ;                                                                  \
        echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ;    \