Date: Mon, 24 Mar 2014 22:06:18 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349073 - head/x11/wdm Message-ID: <201403242206.s2OM6Ixw020813@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Mar 24 22:06:18 2014 New Revision: 349073 URL: http://svnweb.freebsd.org/changeset/ports/349073 QAT: https://qat.redports.org/buildarchive/r349073/ Log: Support stage Use options framework Modified: head/x11/wdm/Makefile head/x11/wdm/pkg-plist Modified: head/x11/wdm/Makefile ============================================================================== --- head/x11/wdm/Makefile Mon Mar 24 22:05:59 2014 (r349072) +++ head/x11/wdm/Makefile Mon Mar 24 22:06:18 2014 (r349073) @@ -18,12 +18,16 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= xride@FreeBSD.org COMMENT= WINGs Display Manager; an xdm replacement -LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker +LIB_DEPENDS= libWINGs.so:${PORTSDIR}/x11-wm/windowmaker NOT_FOR_ARCHS= sparc64 +OPTIONS_DEFINE= PAM +OPTIONS_DEFAULT= PAM +OPTIONS_SUB= yes + +USES= tar:bzip2 USE_XORG= x11 xmu -USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV= DEF_SERVER="${DEF_SERVER}" XRDB_PATH="${XRDB_PATH}" CONFIGURE_ARGS= --with-logdir=/var/log \ @@ -38,8 +42,6 @@ CONFIGURE_ARGS= --with-logdir=/var/log \ --with-defsystempath=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin \ --with-wmlist=wmaker:afterstep:blackbox:ctwm:enlightenment:fvwm:fvwm2:fvwm95:olvwm:qvwm:tvtwm -MAN1= wdm.1 wdmLogin.1 - CPPFLAGS+= -I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT LDFLAGS+= -L${LOCALBASE}/lib -lintl @@ -48,28 +50,8 @@ XRDB_PATH?= ${LOCALBASE}/bin/xrdb WDMDIR= ${PREFIX}/lib/X11/wdm -NO_STAGE= yes -.include <bsd.port.pre.mk> - -.if !defined(WITHOUT_PAM) -WITH_PAM= yes -CONFIGURE_ARGS+= --with-pamdir=${LOCALBASE}/etc/pam.d/ -PLIST_SUB+= PAM="" -.else -PLIST_SUB+= PAM="@comment " -.endif - -.if !defined(WITH_PAM) -CONFIGURE_ARGS+= --disable-pam -.endif - -pre-everything:: -.if !defined(WITH_PAM) - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with PAM support," - @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_PAM=yes\"" - @${ECHO_MSG} -.endif +PAM_CONFIGURE_OFF= --disable-pam +PAM_CONFIGURE_ON= --with-pamdir=${LOCALBASE}/etc/pam.d/ post-patch: @${REINPLACE_CMD} -e \ @@ -89,28 +71,12 @@ post-patch: @${REINPLACE_CMD} -e \ 's|/etc/X11/wdm|${WDMDIR}|g' ${WRKSRC}/doc/wdmLogin.man -pre-install: -.if exists(${WDMDIR}/wdm-config) - ${MV} ${WDMDIR}/wdm-config ${WDMDIR}/wdm-config.preserve -.endif -.if exists(${WDMDIR}/Xsetup_0) - ${MV} ${WDMDIR}/Xsetup_0 ${WDMDIR}/Xsetup_0.preserve -.endif - post-install: - @${CP} ${WDMDIR}/wdm-config ${WDMDIR}/wdm-config.dist -.if exists(${WDMDIR}/wdm-config.preserve) - ${MV} ${WDMDIR}/wdm-config.preserve ${WDMDIR}/wdm-config -.endif - @${CP} ${WDMDIR}/Xsetup_0 ${WDMDIR}/Xsetup_0.dist -.if exists(${WDMDIR}/Xsetup_0.preserve) - ${MV} ${WDMDIR}/Xsetup_0.preserve ${WDMDIR}/Xsetup_0 -.endif + @${MV} ${STAGEDIR}${WDMDIR}/wdm-config ${STAGEDIR}${WDMDIR}/wdm-config.dist + @${MV} ${STAGEDIR}${WDMDIR}/Xsetup_0 ${STAGEDIR}${WDMDIR}/Xsetup_0.dist .for file in beastie.xpm daemon1-HQ-1280x960.jpg - @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WDMDIR}/pixmaps + @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${file} ${STAGEDIR}${WDMDIR}/pixmaps .endfor -.if defined(WITH_PAM) - ${INSTALL_DATA} ${FILESDIR}/wdm.pam ${LOCALBASE}/etc/pam.d/wdm -.endif + ${INSTALL_DATA} ${FILESDIR}/wdm.pam ${STAGEDIR}${LOCALBASE}/etc/pam.d/wdm -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/x11/wdm/pkg-plist ============================================================================== --- head/x11/wdm/pkg-plist Mon Mar 24 22:05:59 2014 (r349072) +++ head/x11/wdm/pkg-plist Mon Mar 24 22:06:18 2014 (r349073) @@ -29,6 +29,8 @@ lib/X11/wdm/wdm-config.dist @exec [ -f %D/lib/X11/wdm/wdm-config ] || (cp %D/lib/X11/wdm/wdm-config.dist %D/lib/X11/wdm/wdm-config) lib/X11/wdm/wdm-config.in lib/X11/wdm/wdmReconfig +man/man1/wdm.1.gz +man/man1/wdmLogin.1.gz share/locale/cs/LC_MESSAGES/wdm.mo share/locale/cy/LC_MESSAGES/wdm.mo share/locale/de/LC_MESSAGES/wdm.mo @@ -43,3 +45,5 @@ share/locale/ru/LC_MESSAGES/wdm.mo @dirrmtry lib/X11/wdm %%PAM%%@cwd %%LOCALBASE%% %%PAM%%etc/pam.d/wdm +@cwd / +@dirrmtry /var/run/wdm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403242206.s2OM6Ixw020813>