Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Jan 2019 16:45:10 +0000 (UTC)
From:      Roman Bogorodskiy <novel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490492 - head/x11-wm/openbox
Message-ID:  <201901161645.x0GGjA27066899@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: novel
Date: Wed Jan 16 16:45:09 2019
New Revision: 490492
URL: https://svnweb.freebsd.org/changeset/ports/490492

Log:
  x11-wm/openbox: use @sample for global config files
  
  Even though users usually keep WM configuration local, it's
  good to use @sample for global configuration files to avoid
  losing it on package reinstalls.
  
  Bump PORTREVISION due to package change.
  
  PR:		227338
  Reported by:	meine <trialero@gmx.com>

Modified:
  head/x11-wm/openbox/Makefile
  head/x11-wm/openbox/pkg-plist

Modified: head/x11-wm/openbox/Makefile
==============================================================================
--- head/x11-wm/openbox/Makefile	Wed Jan 16 16:15:47 2019	(r490491)
+++ head/x11-wm/openbox/Makefile	Wed Jan 16 16:45:09 2019	(r490492)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openbox
 PORTVERSION=	3.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://openbox.org/dist/openbox/
 
@@ -23,6 +23,7 @@ USE_XORG=	ice sm x11 xcursor xext xft xinerama xrandr 
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 SHEBANG_FILES=	data/autostart/openbox-xdg-autostart
+ETCDIR=		${PREFIX}/etc/xdg/${PORTNAME}
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lXext
@@ -56,5 +57,11 @@ PATCHES_EXTRA_PATCHES=	${PATCHDIR}/openbox-3.5.0-title
 
 post-configure:
 	@${CHMOD} +x ${WRKSRC}/install-sh
+
+post-install:
+.for config_file in autostart environment menu.xml rc.xml
+	@${MV} ${STAGEDIR}${ETCDIR}/${config_file} \
+		${STAGEDIR}${ETCDIR}/${config_file}.sample
+.endfor
 
 .include <bsd.port.mk>

Modified: head/x11-wm/openbox/pkg-plist
==============================================================================
--- head/x11-wm/openbox/pkg-plist	Wed Jan 16 16:15:47 2019	(r490491)
+++ head/x11-wm/openbox/pkg-plist	Wed Jan 16 16:45:09 2019	(r490492)
@@ -25,10 +25,10 @@ bin/openbox
 bin/openbox-gnome-session
 bin/openbox-kde-session
 bin/openbox-session
-etc/xdg/openbox/autostart
-etc/xdg/openbox/environment
-etc/xdg/openbox/menu.xml
-etc/xdg/openbox/rc.xml
+@sample %%ETCDIR%%/autostart.sample
+@sample %%ETCDIR%%/environment.sample
+@sample %%ETCDIR%%/menu.xml.sample
+@sample %%ETCDIR%%/rc.xml.sample
 lib/libobrender.a
 lib/libobrender.so
 lib/libobrender.so.29



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901161645.x0GGjA27066899>