svn commit: r369334 - head/x11/xdm

Alex Kozlov ak at FreeBSD.org
Fri Sep 26 18:44:23 UTC 2014 

Author: ak
Date: Fri Sep 26 18:44:22 2014
New Revision: 369334
URL: http://svnweb.freebsd.org/changeset/ports/369334
QAT: https://qat.redports.org/buildarchive/r369334/

Log:
  - Use options helpers
  - Convert to @sample
  - Strip binaries
  - Use new @dir syntax
  
  Reviewed by:	bapt, kwm
  Approved by:	x11 (bapt, kwm)
  Differential Revision:	https://reviews.freebsd.org/D724

Modified:
  head/x11/xdm/Makefile
  head/x11/xdm/pkg-plist

Modified: head/x11/xdm/Makefile
==============================================================================
--- head/x11/xdm/Makefile	Fri Sep 26 18:39:45 2014	(r369333)
+++ head/x11/xdm/Makefile	Fri Sep 26 18:44:22 2014	(r369334)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xdm
 PORTVERSION=	1.1.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -12,25 +12,21 @@ LICENSE=	MIT
 
 XORG_CAT=	app
 USE_XORG=	xmu x11 xau xinerama xpm xdmcp xt xext xaw
-CONFIGURE_ARGS+=	--with-xdmconfigdir=${EXAMPLESDIR} \
-			--with-xdmscriptdir=${EXAMPLESDIR}
+CONFIGURE_ARGS+=	--with-xdmconfigdir=${PREFIX}/lib/X11/xdm \
+			--with-xdmscriptdir=${PREFIX}/lib/X11/xdm
 USES=		libtool
 
 CFFILES=	GiveConsole TakeConsole Xaccess Xreset Xresources \
 		Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
 
+OPTIONS_SUB=	yes
+
 OPTIONS_DEFINE=	XDMSHELL
 XDMSHELL_DESC=	Install xdmshell
 
-.include <bsd.port.options.mk>
+XDMSHELL_CONFIGURE_ENABLE=	xdmshell
 
-.if ${PORT_OPTIONS:MXDMSHELL}
-CONFIGURE_ARGS+=--enable-xdmshell
-PLIST_SUB+=	XDMSHELL=""
-.else
-CONFIGURE_ARGS+=--disable-xdmshell
-PLIST_SUB+=	XDMSHELL="@comment "
-.endif
+INSTALL_TARGET=	install-strip
 
 post-patch:
 	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
@@ -42,15 +38,11 @@ post-patch:
 			${WRKSRC}/config/Xreset.cpp
 	@${REINPLACE_CMD} -e "s|@DESTDIR@||" ${WRKSRC}/Makefile.in
 
-post-configure:
-	@${REINPLACE_CMD} -e "s|${EXAMPLESDIR}|${PREFIX}/lib/X11/xdm|" \
-			${WRKSRC}/config.h
-
 post-install:
 .for f in ${CFFILES}
-	${CP} -n ${EXAMPLESDIR}/$f ${STAGEDIR}${PREFIX}/lib/X11/xdm/$f || ${TRUE}
+	@${MV} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f}.sample
 .endfor
-	${MKDIR} /var/lib/xdm/authdir
-	${LN} -sf /var/lib/xdm/authdir ${STAGEDIR}${PREFIX}/lib/X11/xdm/authdir
+	@${MKDIR} ${STAGEDIR}/var/lib/xdm/authdir
+	@${LN} -sf /var/lib/xdm/authdir ${STAGEDIR}${PREFIX}/lib/X11/xdm/authdir
 
 .include <bsd.port.mk>

Modified: head/x11/xdm/pkg-plist
==============================================================================
--- head/x11/xdm/pkg-plist	Fri Sep 26 18:39:45 2014	(r369333)
+++ head/x11/xdm/pkg-plist	Fri Sep 26 18:44:22 2014	(r369334)
@@ -8,47 +8,18 @@ lib/X11/xdm/pixmaps/xorg.xpm
 man/man1/xdm.1.gz
 %%XDMSHELL%%man/man1/xdmshell.1.gz
 share/X11/app-defaults/Chooser
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset; then rm -f %D/lib/X11/xdm/Xreset; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup; then rm -f %D/lib/X11/xdm/Xstartup; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config; then rm -f %D/lib/X11/xdm/xdm-config; fi
-%%EXAMPLESDIR%%/GiveConsole
-%%EXAMPLESDIR%%/TakeConsole
-%%EXAMPLESDIR%%/Xaccess
-%%EXAMPLESDIR%%/Xreset
-%%EXAMPLESDIR%%/Xresources
-%%EXAMPLESDIR%%/Xservers
-%%EXAMPLESDIR%%/Xsession
-%%EXAMPLESDIR%%/Xsetup_0
-%%EXAMPLESDIR%%/Xstartup
-%%EXAMPLESDIR%%/Xwilling
-%%EXAMPLESDIR%%/xdm-config
- at exec cp -n %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole
- at exec cp -n %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole
- at exec cp -n %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess
- at exec cp -n %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset
- at exec cp -n %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources
- at exec cp -n %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers
- at exec cp -n %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession
- at exec cp -n %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0
- at exec cp -n %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup
- at exec cp -n %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling
- at exec cp -n %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config
- at exec mkdir -p /var/lib/xdm/authdir
- at dirrmtry share/X11/app-defaults
- at dirrmtry share/X11
- at unexec rm -f /var/lib/xdm/authdir/authfiles/* 2>/dev/null || true
- at unexec rmdir /var/lib/xdm/authdir/authfiles 2>/dev/null || true
- at unexec rmdir /var/lib/xdm/authdir 2>/dev/null
- at unexec rmdir /var/lib/xdm 2>/dev/null
- at unexec rmdir /var/lib 2>/dev/null
- at dirrm lib/X11/xdm/pixmaps
- at dirrm lib/X11/xdm
- at dirrm %%EXAMPLESDIR%%
+ at sample lib/X11/xdm/GiveConsole.sample
+ at sample lib/X11/xdm/TakeConsole.sample
+ at sample lib/X11/xdm/Xaccess.sample
+ at sample lib/X11/xdm/Xreset.sample
+ at sample lib/X11/xdm/Xresources.sample
+ at sample lib/X11/xdm/Xservers.sample
+ at sample lib/X11/xdm/Xsession.sample
+ at sample lib/X11/xdm/Xsetup_0.sample
+ at sample lib/X11/xdm/Xstartup.sample
+ at sample lib/X11/xdm/Xwilling.sample
+ at sample lib/X11/xdm/xdm-config.sample
+ at unexec rm -rf /var/lib/xdm/authdir/* 2>/dev/null || true
+ at dir /var/lib/xdm/authdir
+ at dir /var/lib/xdm
+ at dir /var/lib

More information about the svn-ports-all mailing list