From owner-svn-ports-head@freebsd.org Wed Jan 16 16:45:11 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2AD6148E14F; Wed, 16 Jan 2019 16:45:10 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9624975697; Wed, 16 Jan 2019 16:45:10 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 81EC7504D; Wed, 16 Jan 2019 16:45:10 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0GGjAda066900; Wed, 16 Jan 2019 16:45:10 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0GGjA27066899; Wed, 16 Jan 2019 16:45:10 GMT (envelope-from novel@FreeBSD.org) Message-Id: <201901161645.x0GGjA27066899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Wed, 16 Jan 2019 16:45:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490492 - head/x11-wm/openbox X-SVN-Group: ports-head X-SVN-Commit-Author: novel X-SVN-Commit-Paths: head/x11-wm/openbox X-SVN-Commit-Revision: 490492 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9624975697 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2019 16:45:11 -0000 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 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 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