diff options
| author | lme <lme@FreeBSD.org> | 2013-10-06 17:09:21 +0800 |
|---|---|---|
| committer | lme <lme@FreeBSD.org> | 2013-10-06 17:09:21 +0800 |
| commit | 646d8516ca798aaa8ee710bb3d8f4d264a96fb26 (patch) | |
| tree | ad1bf53c30661374eb4506ad99f577c2a601bb33 /x11 | |
| parent | 5bc078229a06a951f4d71b318bf754df32366cc3 (diff) | |
| download | freebsd-ports-gnome-646d8516ca798aaa8ee710bb3d8f4d264a96fb26.tar.gz freebsd-ports-gnome-646d8516ca798aaa8ee710bb3d8f4d264a96fb26.tar.zst freebsd-ports-gnome-646d8516ca798aaa8ee710bb3d8f4d264a96fb26.zip | |
- Enable PAM support by default [1]
- Support staging
- Use new LIB_DEPENDS syntax
PR: ports/182533 [1]
Approved by: maintainer
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/slim/Makefile | 32 | ||||
| -rw-r--r-- | x11/slim/pkg-plist | 11 |
2 files changed, 18 insertions, 25 deletions
diff --git a/x11/slim/Makefile b/x11/slim/Makefile index fb8406016729..3cfd91370d03 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -3,6 +3,7 @@ PORTNAME= slim PORTVERSION= 1.3.5 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= ftp://ftp.berlios.de/pub/slim/ \ SF/slim.berlios @@ -12,14 +13,14 @@ COMMENT= Graphical login manager for X11, derived from Login.app LICENSE= GPLv2 -LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \ - pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ - jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png \ - freetype:${PORTSDIR}/print/freetype2 \ - ck-connector:${PORTSDIR}/sysutils/consolekit \ - expat:${PORTSDIR}/textproc/expat2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig +LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ + libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png \ + libfreetype.so:${PORTSDIR}/print/freetype2 \ + libck-connector.so:${PORTSDIR}/sysutils/consolekit \ + libexpat.so:${PORTSDIR}/textproc/expat2 \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig USES= cmake pkgconfig USE_XORG= ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt @@ -28,11 +29,9 @@ SUB_FILES= pkg-message CMAKE_ARGS= -DUSE_CONSOLEKIT=yes -MAN1= slim.1 +OPTIONS_DEFINE= PAM +OPTIONS_DEFAULT= PAM -OPTIONS_DEFINE= PAM - -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MPAM} @@ -55,15 +54,8 @@ post-patch: ${WRKSRC}/CMakeLists.txt post-install: - @if [ ! -f ${PREFIX}/etc/slim.conf ]; then \ - ${CP} ${PREFIX}/etc/slim.conf.sample ${PREFIX}/etc/slim.conf ; \ - fi . if ${PORT_OPTIONS:MPAM} - @${INSTALL_DATA} ${FILESDIR}/pam.conf ${PREFIX}/etc/pam.d/slim.default - @if [ ! -f ${PREFIX}/etc/pam.d/slim ]; then \ - ${CP} ${PREFIX}/etc/pam.d/slim.default ${PREFIX}/etc/pam.d/slim ; \ - fi + ${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/slim.default . endif - @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11/slim/pkg-plist b/x11/slim/pkg-plist index 1fba1bd91f73..0b2502b57067 100644 --- a/x11/slim/pkg-plist +++ b/x11/slim/pkg-plist @@ -2,12 +2,13 @@ bin/slim %%DATADIR%%/themes/default/background.jpg %%DATADIR%%/themes/default/panel.png %%DATADIR%%/themes/default/slim.theme -@dirrm %%DATADIR%%/themes/default +man/man1/slim.1.gz +@dirrmtry %%DATADIR%%/themes/default @dirrmtry %%DATADIR%%/themes @dirrmtry %%DATADIR%% -@unexec if cmp -s %D/etc/slim.conf.sample %D/etc/slim.conf; then rm -f %D/etc/slim.conf; fi +@unexec if cmp -s %D/etc/slim.conf.sample %D/etc/slim.conf ; then rm -f %D/etc/slim.conf ; fi etc/slim.conf.sample -@exec if [ ! -f %D/etc/slim.conf ] ; then cp -p %D/%F %B/slim.conf; fi -%%PAM%%@unexec if cmp -s %D/etc/pam.d/slim.default %D/etc/pam.d/slim; then rm -f %D/etc/pam.d/slim ; fi +@exec if [ ! -f %D/etc/slim.conf ]; then cp -p %D/%F %B/slim .conf; fi +%%PAM%%@unexec if cmp -s %D/etc/pam.d/slim.default %D/etc/pam.d/slim ; then rm -f %D/etc/pam.d/slim ; fi %%PAM%%etc/pam.d/slim.default -%%PAM%%@exec if [ ! -f %D/etc/pam.d/slim ] ; then cp -p %D/%F %B/slim; fi +%%PAM%%@exec if [ ! -f %D/etc/pam.d/slim ]; then cp -p %D/%F %B/pam.d/slim fi |