[Midnightbsd-cvs] mports [23113] trunk/x11/mlogind: switch to sample

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Mar 8 10:35:02 EST 2018


Revision: 23113
          http://svnweb.midnightbsd.org/mports/?rev=23113
Author:   laffer1
Date:     2018-03-08 10:35:01 -0500 (Thu, 08 Mar 2018)
Log Message:
-----------
switch to sample

Modified Paths:
--------------
    trunk/x11/mlogind/Makefile
    trunk/x11/mlogind/pkg-plist

Modified: trunk/x11/mlogind/Makefile
===================================================================
--- trunk/x11/mlogind/Makefile	2018-03-08 15:20:26 UTC (rev 23112)
+++ trunk/x11/mlogind/Makefile	2018-03-08 15:35:01 UTC (rev 23113)
@@ -34,8 +34,8 @@
 	-DBUILD_SLIMLOCK=no \
 	-DBUILD_SHARED_LIBS=yes
 
-OPTIONS_DEFINE=		PAM UTF8 CONSOLEKIT
-OPTIONS_DEFAULT=	PAM CONSOLEKIT
+OPTIONS_DEFINE=		UTF8 CONSOLEKIT
+OPTIONS_DEFAULT=	CONSOLEKIT
 OPTIONS_SUB=	yes
 
 UTF8_DESC=	Support UTF-8 characters
@@ -45,13 +45,7 @@
 
 .include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MPAM}
 CMAKE_ARGS+=	-DUSE_PAM=yes
-PLIST_SUB+=	PAM=""
-.else
-CMAKE_ARGS+=	-DUSE_PAM=no
-PLIST_SUB+=	PAM="@comment "
-.endif
 
 .if ${PORT_OPTIONS:MUTF8}
 # patch taken from slim-unicode in Arch User Repository
@@ -73,8 +67,6 @@
 		${WRKSRC}/mlogind.1
 
 post-install:
-.	if ${PORT_OPTIONS:MPAM}
-	${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/mlogind.default
-.	endif
+	${INSTALL_DATA} ${FILESDIR}/pam.conf ${PREFIX}/etc/pam.d/mlogind.sample
 
 .include <bsd.port.mk>

Modified: trunk/x11/mlogind/pkg-plist
===================================================================
--- trunk/x11/mlogind/pkg-plist	2018-03-08 15:20:26 UTC (rev 23112)
+++ trunk/x11/mlogind/pkg-plist	2018-03-08 15:35:01 UTC (rev 23113)
@@ -6,6 +6,4 @@
 %%DATADIR%%/themes/default/mlogind.theme
 man/man1/mlogind.1.gz
 @sample etc/mlogind.conf.sample
-%%PAM%%@unexec if cmp -s %D/etc/pam.d/mlogind.default %D/etc/pam.d/mlogind; then rm -f %D/etc/pam.d/mlogind; fi
-%%PAM%%etc/pam.d/mlogind.default
-%%PAM%%@exec if [ ! -f %D/etc/pam.d/mlogind ]; then cp -p %D/%F %B/mlogind; fi
+ at sample etc/pam.d/mlogind.sample



More information about the Midnightbsd-cvs mailing list