aboutsummaryrefslogtreecommitdiffstats
path: root/x11/xscreensaver-gnome
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2004-02-03 03:49:43 +0800
committermarcus <marcus@FreeBSD.org>2004-02-03 03:49:43 +0800
commit693359f080cd61b2a89cbb130bfc5e0d62261ff7 (patch)
tree0504d0c78ae360ccc8b5b32ed4c6bf77dae56cc7 /x11/xscreensaver-gnome
parent253bb70304f7ac4d65424968c3eda057e0ca97f3 (diff)
downloadfreebsd-ports-gnome-693359f080cd61b2a89cbb130bfc5e0d62261ff7.tar.gz
freebsd-ports-gnome-693359f080cd61b2a89cbb130bfc5e0d62261ff7.tar.zst
freebsd-ports-gnome-693359f080cd61b2a89cbb130bfc5e0d62261ff7.zip
Add optional PAM support, and make this port use OPTIONS.
PR: 61237
Diffstat (limited to 'x11/xscreensaver-gnome')
-rw-r--r--x11/xscreensaver-gnome/Makefile15
-rw-r--r--x11/xscreensaver-gnome/files/patch-driver_Makefile.in10
-rw-r--r--x11/xscreensaver-gnome/pkg-messsage13
3 files changed, 29 insertions, 9 deletions
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 2430a8fea8b2..cffc5350dd1f 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gnomehier libglade2 gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --with-xml \
+CONFIGURE_ARGS= --with-gl --with-gle --with-xpm --with-xml \
--with-hackdir=${PREFIX}/bin/xscreensaver-hacks \
--with-configdir=${PREFIX}/share/xscreensaver/config \
--with-jpeg=${LOCALBASE} --without-motif \
@@ -33,9 +33,8 @@ CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --with-xml \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-.if defined(XS_WITH_ALL_FORTUNES)
-CONFIGURE_ARGS+= --with-fortune="/usr/games/fortune -sa"
-.endif
+OPTIONS= PAM "Pluggable Authentication Module support" off \
+ ALL_FORTUNES "Enable support for all fortunes" off
MAN1= anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
blitspin.1 bouboule.1 boxed.1 braid.1 bsod.1 bubble3d.1 bubbles.1 \
@@ -71,6 +70,14 @@ MAN1= anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
.include <bsd.port.pre.mk>
+.if defined(WITH_ALL_FORTUNES)
+CONFIGURE_ARGS+= --with-fortune="/usr/games/fortune -sa"
+.endif
+
+.if !defined(WITH_PAM)
+CONFIGURE_ARGS+= --without-pam
+.endif
+
.if ${ARCH} == "amd64"
CFLAGS+= -O0
.endif
diff --git a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
index faf6df445619..711c6b14536c 100644
--- a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
@@ -1,5 +1,5 @@
---- driver/Makefile.in.orig Tue Jul 22 00:19:10 2003
-+++ driver/Makefile.in Tue Jul 22 00:26:47 2003
+--- driver/Makefile.in.orig Mon Feb 2 14:07:14 2004
++++ driver/Makefile.in Mon Feb 2 14:33:43 2004
@@ -24,14 +24,14 @@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
@@ -20,16 +20,16 @@
GNOME_BINDIR = $(bindir)
HACK_CONF_DIR = @HACK_CONF_DIR@
-@@ -239,7 +239,7 @@
+@@ -252,7 +252,7 @@
tests: $(TEST_EXES)
install: install-program install-ad install-scripts \
- install-gnome install-kde install-man @INSTALL_PAM@
-+ install-gnome install-man @INSTALL_PAM@
++ install-gnome install-man
uninstall: uninstall-program uninstall-ad \
uninstall-gnome uninstall-kde uninstall-man
-@@ -478,8 +478,11 @@
+@@ -485,8 +485,11 @@
\
echo $(INSTALL_DATA) screensaver-properties.desktop \
$(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
diff --git a/x11/xscreensaver-gnome/pkg-messsage b/x11/xscreensaver-gnome/pkg-messsage
new file mode 100644
index 000000000000..136fccd9fc8e
--- /dev/null
+++ b/x11/xscreensaver-gnome/pkg-messsage
@@ -0,0 +1,13 @@
+================================================================================
+If you compiled WITH_PAM support on 4.X, you need to edit /etc/pam.conf and
+add the following lines:
+
+xscreensaver auth required pam_nologin.so no_warn
+xscreensaver auth required pam_unix.so no_warn try_pass_first
+
+If you compiled WITH_PAM support on 5.X, you need to create an
+/etc/pam.d/xscreensaver file with the following contents:
+
+auth required pam_nologin.so no_warn
+auth required pam_unix.so no_warn try_pass_first
+================================================================================