diff options
author | Dejan Lesjak <lesi@FreeBSD.org> | 2007-07-02 17:35:13 +0000 |
---|---|---|
committer | Dejan Lesjak <lesi@FreeBSD.org> | 2007-07-02 17:35:13 +0000 |
commit | 7368641642290acc84bd8cdf40e82f367e9c4139 (patch) | |
tree | a294467710308af3615b3963529cf23ae60ccf60 /x11/xdm | |
parent | - Unbreak (diff) |
Replace placeholder XDMCONFIGDIR with proper value in Xreset and Xstartup
scripts [1].
Don't clobber user modifiable config files and scripts [2].
PR: [1] ports/113029 (REINPLACE instead of patch), [2] ports/113894
Notes
Notes:
svn path=/head/; revision=194695
Diffstat (limited to 'x11/xdm')
-rw-r--r-- | x11/xdm/Makefile | 14 | ||||
-rw-r--r-- | x11/xdm/files/patch-config_Makefile.in | 68 | ||||
-rw-r--r-- | x11/xdm/pkg-plist | 52 |
3 files changed, 119 insertions, 15 deletions
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index 0e1025f15999..67578d1a322a 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -7,7 +7,7 @@ PORTNAME= xdm PORTVERSION= 1.1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -15,7 +15,19 @@ COMMENT= X.Org X display manager XORG_CAT= app USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw +MAKE_ENV= EXAMPLESDIR=${EXAMPLESDIR} MAN1= xdm.1 +CFFILES= GiveConsole TakeConsole Xaccess Xreset Xresources \ + Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config + +post-patch: + ${REINPLACE_CMD} -e "s,XDMCONFIGDIR,${PREFIX}/lib/X11/xdm,g" ${WRKSRC}/config/Xreset.cpp ${WRKSRC}/config/Xstartup.cpp + +post-install: +.for f in ${CFFILES} + ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f +.endfor + .include <bsd.port.mk> diff --git a/x11/xdm/files/patch-config_Makefile.in b/x11/xdm/files/patch-config_Makefile.in new file mode 100644 index 000000000000..1a27563f4d7b --- /dev/null +++ b/x11/xdm/files/patch-config_Makefile.in @@ -0,0 +1,68 @@ +--- config/Makefile.in.orig Tue Feb 6 20:47:18 2007 ++++ config/Makefile.in Thu Jun 21 15:08:28 2007 +@@ -370,13 +370,13 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-dist_xdmscriptSCRIPTS: $(dist_xdmscript_SCRIPTS) + @$(NORMAL_INSTALL) +- test -z "$(xdmscriptdir)" || $(mkdir_p) "$(DESTDIR)$(xdmscriptdir)" ++ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)" + @list='$(dist_xdmscript_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(dist_xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmscriptdir)/$$f'"; \ +- $(dist_xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmscriptdir)/$$f"; \ ++ echo " $(dist_xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \ ++ $(dist_xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \ + else :; fi; \ + done + +@@ -389,13 +389,13 @@ + done + install-xdmscriptSCRIPTS: $(xdmscript_SCRIPTS) + @$(NORMAL_INSTALL) +- test -z "$(xdmscriptdir)" || $(mkdir_p) "$(DESTDIR)$(xdmscriptdir)" ++ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)" + @list='$(xdmscript_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmscriptdir)/$$f'"; \ +- $(xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmscriptdir)/$$f"; \ ++ echo " $(xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \ ++ $(xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \ + else :; fi; \ + done + +@@ -435,12 +435,12 @@ + done + install-dist_xdmconfigDATA: $(dist_xdmconfig_DATA) + @$(NORMAL_INSTALL) +- test -z "$(xdmconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdmconfigdir)" ++ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)" + @list='$(dist_xdmconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +- echo " $(dist_xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmconfigdir)/$$f'"; \ +- $(dist_xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmconfigdir)/$$f"; \ ++ echo " $(dist_xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \ ++ $(dist_xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \ + done + + uninstall-dist_xdmconfigDATA: +@@ -452,12 +452,12 @@ + done + install-xdmconfigDATA: $(xdmconfig_DATA) + @$(NORMAL_INSTALL) +- test -z "$(xdmconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdmconfigdir)" ++ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)" + @list='$(xdmconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +- echo " $(xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmconfigdir)/$$f'"; \ +- $(xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmconfigdir)/$$f"; \ ++ echo " $(xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \ ++ $(xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \ + done + + uninstall-xdmconfigDATA: diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist index 58164f1ab381..d651fb0afe3f 100644 --- a/x11/xdm/pkg-plist +++ b/x11/xdm/pkg-plist @@ -1,24 +1,48 @@ bin/xdm bin/xdmshell +lib/X11/xdm/chooser +lib/X11/xdm/libXdmGreet.a +lib/X11/xdm/libXdmGreet.la +lib/X11/xdm/libXdmGreet.so lib/X11/xdm/pixmaps/xorg-bw.xpm lib/X11/xdm/pixmaps/xorg.xpm -lib/X11/xdm/Xaccess -lib/X11/xdm/GiveConsole -lib/X11/xdm/TakeConsole -lib/X11/xdm/Xsetup_0 -lib/X11/xdm/Xstartup -lib/X11/xdm/Xreset -lib/X11/xdm/Xwilling lib/X11/xdm/xdm-config -lib/X11/xdm/Xresources -lib/X11/xdm/Xservers -lib/X11/xdm/Xsession -lib/X11/xdm/libXdmGreet.so -lib/X11/xdm/libXdmGreet.la -lib/X11/xdm/libXdmGreet.a -lib/X11/xdm/chooser share/X11/app-defaults/Chooser +@unexec if cmp -s %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi +@unexec if cmp -s %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi +@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi +@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset; then rm -f %D/lib/X11/xdm/Xreset; fi +@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi +@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi +@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi +@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi +@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup; then rm -f %D/lib/X11/xdm/Xstartup; fi +@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi +@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 +@exec cp -n %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole +@exec cp -n %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole +@exec cp -n %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess +@exec cp -n %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset +@exec cp -n %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources +@exec cp -n %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers +@exec cp -n %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession +@exec cp -n %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0 +@exec cp -n %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup +@exec cp -n %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling +@exec cp -n %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config @dirrmtry share/X11/app-defaults @dirrmtry share/X11 @dirrm lib/X11/xdm/pixmaps @dirrm lib/X11/xdm +@dirrm %%EXAMPLESDIR%% |