1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00

Don't pollute lib, install icons in share/pixmaps and config/scripts in etc

PR:		221160
Submitted by:	melanhit@gmail.com
This commit is contained in:
Matthew Rezny 2017-08-27 19:44:16 +00:00
parent eb72affd4f
commit b685cd4a0f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=448839
2 changed files with 22 additions and 25 deletions

View File

@ -2,7 +2,7 @@
PORTNAME= xdm
PORTVERSION= 1.1.11
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@ -11,15 +11,17 @@ COMMENT= X.Org X display manager
LICENSE= MIT
XORG_CAT= app
USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw
CONFIGURE_ARGS+= --with-xdmconfigdir=${PREFIX}/lib/X11/xdm \
--with-xdmscriptdir=${PREFIX}/lib/X11/xdm \
--with-authdir=/var/db/xdm
USES= cpe libtool
USE_LDCONFIG= yes
USE_XORG= x11 xau xaw xdmcp xext xinerama xmu xpm xt
CPE_PRODUCT= x_display_manager
CPE_VENDOR= x
CONFIGURE_ARGS+= --with-xdmconfigdir=${PREFIX}/etc/X11/xdm \
--with-xdmscriptdir=${PREFIX}/etc/X11/xdm \
--with-pixmapdir=${PREFIX}/share/pixmaps \
--with-authdir=/var/db/xdm
CFFILES= GiveConsole TakeConsole Xaccess Xreset Xresources \
Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
@ -39,16 +41,11 @@ INSTALL_TARGET= install-strip
post-patch:
@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e "s|XDMCONFIGDIR/|${PREFIX}/lib/X11/xdm/|" \
-e "s|XDMSCRIPTDIR/|${PREFIX}/lib/X11/xdm/|" \
${WRKSRC}/config/xdm-config.cpp \
${WRKSRC}/config/Xstartup.cpp \
${WRKSRC}/config/Xreset.cpp
@${REINPLACE_CMD} -e "s|@DESTDIR@||" ${WRKSRC}/Makefile.in
post-install:
.for f in ${CFFILES}
@${MV} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f}.sample
@${MV} ${STAGEDIR}${PREFIX}/etc/X11/xdm/${f} ${STAGEDIR}${PREFIX}/etc/X11/xdm/${f}.sample
.endfor
@${MKDIR} ${STAGEDIR}/var/db/xdm

View File

@ -1,23 +1,23 @@
bin/xdm
%%XDMSHELL%%bin/xdmshell
@sample etc/X11/xdm/GiveConsole.sample
@sample etc/X11/xdm/TakeConsole.sample
@sample etc/X11/xdm/Xaccess.sample
@sample etc/X11/xdm/Xreset.sample
@sample etc/X11/xdm/Xresources.sample
@sample etc/X11/xdm/Xservers.sample
@sample etc/X11/xdm/Xsession.sample
@sample etc/X11/xdm/Xsetup_0.sample
@sample etc/X11/xdm/Xstartup.sample
@sample etc/X11/xdm/Xwilling.sample
@sample etc/X11/xdm/xdm-config.sample
lib/X11/xdm/chooser
lib/X11/xdm/libXdmGreet.so
lib/X11/xdm/pixmaps/xorg-bw.xpm
lib/X11/xdm/pixmaps/xorg.xpm
man/man1/xdm.1.gz
%%XDMSHELL%%man/man1/xdmshell.1.gz
share/X11/app-defaults/Chooser
@sample lib/X11/xdm/GiveConsole.sample
@sample lib/X11/xdm/TakeConsole.sample
@sample lib/X11/xdm/Xaccess.sample
@sample lib/X11/xdm/Xreset.sample
@sample lib/X11/xdm/Xresources.sample
@sample lib/X11/xdm/Xservers.sample
@sample lib/X11/xdm/Xsession.sample
@sample lib/X11/xdm/Xsetup_0.sample
@sample lib/X11/xdm/Xstartup.sample
@sample lib/X11/xdm/Xwilling.sample
@sample lib/X11/xdm/xdm-config.sample
share/pixmaps/xorg-bw.xpm
share/pixmaps/xorg.xpm
@postunexec rm -rf /var/db/xdm/* 2>/dev/null || true
@dir /var/db/xdm
@dir /var/db