[144011] trunk/dports/x11/xinit

[jeremyhu at macports.org]

Revision: 144011
          https://trac.macports.org/changeset/144011
Author:   jeremyhu at macports.org
Date:     2015-12-29 17:25:26 -0800 (Tue, 29 Dec 2015)
Log Message:
-----------
xinit: Fix install path for privileged_startx

Modified Paths:
--------------
    trunk/dports/x11/xinit/Portfile

Added Paths:
-----------
    trunk/dports/x11/xinit/files/0001-launchd-Install-binaries-into-libexecdir.patch

Modified: trunk/dports/x11/xinit/Portfile
===================================================================
--- trunk/dports/x11/xinit/Portfile	2015-12-30 01:23:20 UTC (rev 144010)
+++ trunk/dports/x11/xinit/Portfile	2015-12-30 01:25:26 UTC (rev 144011)
@@ -5,7 +5,7 @@
 
 name                xinit
 version             1.3.4
-revision            1
+revision            2
 categories          x11
 platforms           darwin
 maintainers         jeremyhu openmaintainer
@@ -31,16 +31,23 @@
                     port:mkfontdir
 
 depends_build       port:pkgconfig \
+                    port:xorg-util-macros \
                     port:tradcpp
 
 depends_lib         port:xorg-libX11
 
+patchfiles-append \
+    0001-launchd-Install-binaries-into-libexecdir.patch
+
 if {[vercmp ${os.version} 10.3.0] < 0} {
     patchfiles-append disable-launchagent.patch
 }
 
 patch.pre_args -p1
 
+use_autoreconf  yes
+autoreconf.args -fvi
+
 configure.args      --disable-silent-rules \
                     --with-launchd-id-prefix=org.macports
 

Added: trunk/dports/x11/xinit/files/0001-launchd-Install-binaries-into-libexecdir.patch
===================================================================
--- trunk/dports/x11/xinit/files/0001-launchd-Install-binaries-into-libexecdir.patch	                        (rev 0)
+++ trunk/dports/x11/xinit/files/0001-launchd-Install-binaries-into-libexecdir.patch	2015-12-30 01:25:26 UTC (rev 144011)
@@ -0,0 +1,105 @@
+From 72160c42bea2073bf95c01aca59a12f0ca7ab707 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Tue, 29 Dec 2015 17:03:43 -0800
+Subject: [PATCH] launchd: Install binaries into libexecdir
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ launchd/privileged_startx/Makefile.am                 | 6 +++---
+ launchd/privileged_startx/privileged_startx.plist.cpp | 2 +-
+ launchd/user_startx/Makefile.am                       | 5 ++---
+ launchd/user_startx/startx.plist.cpp                  | 2 +-
+ startx.cpp                                            | 4 ++--
+ 5 files changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/launchd/privileged_startx/Makefile.am b/launchd/privileged_startx/Makefile.am
+index 811cbdb..a6ed492 100644
+--- a/launchd/privileged_startx/Makefile.am
++++ b/launchd/privileged_startx/Makefile.am
+@@ -27,14 +27,14 @@
+ 
+ include $(top_srcdir)/cpprules.in
+ 
+-xinitrcdir = $(libdir)/X11/xinit
++xinitrcdir = $(XINITDIR)
+ privstartxdir = $(xinitrcdir)/privileged_startx.d
+ 
+-xinitrc_PROGRAMS = privileged_startx
++libexec_PROGRAMS = privileged_startx
+ privstartx_SCRIPTS = 10-tmpdirs 20-font_cache
+ 
+ AM_CPPFLAGS = -I$(srcdir)/.. -DXINITDIR=\"$(xinitrcdir)\" -DSCRIPTDIR=\"$(privstartxdir)\" -DBINDIR=\"$(bindir)\"
+-CPP_FILES_FLAGS = -DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)" -DBUNDLE_ID_PREFIX="$(bundleidprefix)"
++CPP_FILES_FLAGS = -D__libexecdir__="$(libexecdir)" -DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)" -DBUNDLE_ID_PREFIX="$(bundleidprefix)"
+ 
+ if TIGER_LAUNCHD
+ CPP_FILES_FLAGS += -DTIGER_LAUNCHD
+diff --git a/launchd/privileged_startx/privileged_startx.plist.cpp b/launchd/privileged_startx/privileged_startx.plist.cpp
+index e23e892..e1652b0 100644
+--- a/launchd/privileged_startx/privileged_startx.plist.cpp
++++ b/launchd/privileged_startx/privileged_startx.plist.cpp
+@@ -6,7 +6,7 @@
+ 		<string>BUNDLE_ID_PREFIX.privileged_startx</string>
+ 	<key>ProgramArguments</key>
+ 		<array>
+-			<string>XINITDIR/privileged_startx</string>
++			<string>__libexecdir__/privileged_startx</string>
+ 			<string>-d</string>
+ 			<string>SCRIPTDIR</string>
+ 		</array>
+diff --git a/launchd/user_startx/Makefile.am b/launchd/user_startx/Makefile.am
+index bf18fb0..e895ee2 100644
+--- a/launchd/user_startx/Makefile.am
++++ b/launchd/user_startx/Makefile.am
+@@ -21,9 +21,7 @@
+ 
+ include $(top_srcdir)/cpprules.in
+ 
+-xinitrcdir = $(XINITDIR)
+-
+-xinitrc_PROGRAMS = launchd_startx
++libexec_PROGRAMS = launchd_startx
+ 
+ AM_CPPFLAGS = -I$(srcdir)/.. -DXINITDIR=\"$(xinitrcdir)\" -DBINDIR=\"$(bindir)\"
+ 
+@@ -32,6 +30,7 @@ dist_launchd_startx_SOURCES = \
+ 	launchd_startx.c
+ 
+ CPP_FILES_FLAGS = \
++	-D__libexecdir__="$(libexecdir)" \
+ 	-D__xinitrcdir__="$(xinitrcdir)" \
+ 	-D__bindir__="$(bindir)" \
+ 	-DBUNDLE_ID_PREFIX="$(bundleidprefix)"
+diff --git a/launchd/user_startx/startx.plist.cpp b/launchd/user_startx/startx.plist.cpp
+index a43025f..f79d461 100644
+--- a/launchd/user_startx/startx.plist.cpp
++++ b/launchd/user_startx/startx.plist.cpp
+@@ -6,7 +6,7 @@
+ 		<string>BUNDLE_ID_PREFIX.startx</string>
+ 	<key>ProgramArguments</key>
+ 		<array>
+-			<string>__xinitrcdir__/launchd_startx</string>
++			<string>__libexecdir__/launchd_startx</string>
+ 			<string>__bindir__/startx</string>
+ #ifdef LAUNCHAGENT_XSERVER_PATH
+ 			<string>--</string>
+diff --git a/startx.cpp b/startx.cpp
+index 2a10283..2dda9e1 100644
+--- a/startx.cpp
++++ b/startx.cpp
+@@ -91,10 +91,10 @@ if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then
+     fi
+ fi
+ 
+-if [ -x XINITDIR/privileged_startx ] ; then
++if [ -x __libexecdir__/privileged_startx ] ; then
+ 	# Don't push this into the background becasue it can cause
+ 	# a race to create /tmp/.X11-unix
+-	XINITDIR/privileged_startx
++	__libexecdir__/privileged_startx
+ fi
+ 
+ if [ x`defaults read $X11_PREFS_DOMAIN no_auth` = x0 ] ; then
+-- 
+2.6.4
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151229/310ba4f7/attachment-0001.html>