[52067] trunk/dports/x11/xinit
jeremyhu at macports.org
jeremyhu at macports.org
Tue Jun 9 10:20:11 PDT 2009
Revision: 52067
http://trac.macports.org/changeset/52067
Author: jeremyhu at macports.org
Date: 2009-06-09 10:20:10 -0700 (Tue, 09 Jun 2009)
Log Message:
-----------
xinit: SL buildfix
Modified Paths:
--------------
trunk/dports/x11/xinit/Portfile
Added Paths:
-----------
trunk/dports/x11/xinit/files/sl.patch
Modified: trunk/dports/x11/xinit/Portfile
===================================================================
--- trunk/dports/x11/xinit/Portfile 2009-06-09 16:54:02 UTC (rev 52066)
+++ trunk/dports/x11/xinit/Portfile 2009-06-09 17:20:10 UTC (rev 52067)
@@ -4,7 +4,7 @@
name xinit
version 1.1.1
-revision 3
+revision 4
categories x11
platforms darwin
maintainers jeremyhu
@@ -28,9 +28,19 @@
port:mkfontscale \
port:mkfontdir
-depends_build port:pkgconfig
+depends_build port:pkgconfig \
+ port:autoconf \
+ port:automake \
+ port:libtool
+
depends_lib port:xorg-libX11
+use_autoreconf yes
+autoreconf.args -fvi
+
+patchfiles sl.patch
+patch.args -p1
+
post-patch {
reinplace "s|org.x|org.macports|" ${worksrcpath}/privileged_startx/org.x.privileged_startx.plist.cpp
reinplace "s|org.x|org.macports|" ${worksrcpath}/privileged_startx/privileged_startx_types.h
Added: trunk/dports/x11/xinit/files/sl.patch
===================================================================
--- trunk/dports/x11/xinit/files/sl.patch (rev 0)
+++ trunk/dports/x11/xinit/files/sl.patch 2009-06-09 17:20:10 UTC (rev 52067)
@@ -0,0 +1,139 @@
+diff --git xinit-1.1.1/Makefile.am xinit-1.1.1/Makefile.am
+index 0d831f3..951d51a 100644
+--- xinit-1.1.1/Makefile.am
++++ xinit-1.1.1/Makefile.am
+@@ -24,7 +24,7 @@ XINITDIR = $(libdir)/X11/xinit
+ bin_PROGRAMS = xinit
+ bin_SCRIPTS = startx
+
+-xinit_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
++AM_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
+ xinit_LDADD = $(XINIT_LIBS)
+
+ xinit_SOURCES = \
+@@ -77,6 +77,6 @@ EXTRA_DIST = xinitrc.cpp startx.cpp org.x.startx.plist.cpp $(appman_PRE) \
+ .PHONY: ChangeLog
+
+ ChangeLog:
+- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
++ $(CHANGELOG_CMD)
+
+ dist-hook: ChangeLog
+diff --git xinit-1.1.1/configure.ac xinit-1.1.1/configure.ac
+index 78b8827..7e2fb82 100644
+--- xinit-1.1.1/configure.ac
++++ xinit-1.1.1/configure.ac
+@@ -25,6 +25,10 @@ AC_INIT(xinit,[1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+
++# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
++m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
++XORG_MACROS_VERSION(1.2)
++
+ AM_CONFIG_HEADER(config.h)
+
+ AC_PROG_CC
+@@ -41,6 +45,8 @@ AC_CHECK_FUNCS([killpg])
+
+ m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+
++XORG_CWARNFLAGS
++
+ # Build options
+ DEFAULT_XRDB=xrdb
+ DEFAULT_XMODMAP=xmodmap
+@@ -131,6 +137,7 @@ case $host_os in
+ ;;
+ esac
+
++XINIT_CFLAGS="$CWARNFLAGS $XINIT_CFLAGS"
+ AC_SUBST(XINIT_CFLAGS)
+ AC_SUBST(XINIT_LIBS)
+
+@@ -184,6 +191,7 @@ AC_DEFINE(XORG, 1, [Define if you have Xorg X server])
+
+ XORG_MANPAGE_SECTIONS
+ XORG_RELEASE_VERSION
++XORG_CHANGELOG
+
+ AC_OUTPUT([Makefile])
+ AC_OUTPUT([privileged_startx/Makefile])
+diff --git xinit-1.1.1/startx.cpp xinit-1.1.1/startx.cpp
+index 8a44965..943fa78 100644
+--- xinit-1.1.1/startx.cpp
++++ xinit-1.1.1/startx.cpp
+@@ -162,13 +162,13 @@ while [ x"$1" != x ]; do
+ XCOMM '' required to prevent cpp from treating "/*" as a C comment.
+ /''*|\./''*)
+ if [ "$whoseargs" = "client" ]; then
+- if [ x"$clientargs" = x ]; then
++ if [ x"$client" = x ] && [ x"$clientargs" = x ]; then
+ client="$1"
+ else
+ clientargs="$clientargs $1"
+ fi
+ else
+- if [ x"$serverargs" = x ]; then
++ if [ x"$server" = x ] && [ x"$serverargs" = x ]; then
+ server="$1"
+ else
+ serverargs="$serverargs $1"
+@@ -279,7 +279,7 @@ if [ x"$enable_xauth" = x1 ] ; then
+ xauth -q -f "$xserverauthfile" << EOF
+ add :$dummy . $mcookie
+ EOF
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__CYGWIN__)
+ serverargs=${serverargs}" -auth '"${xserverauthfile}"'"
+ #else
+ serverargs=${serverargs}" -auth "${xserverauthfile}
+@@ -313,7 +313,7 @@ else
+ fi
+ #else
+
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__CYGWIN__)
+ eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
+ #else
+ XINIT "$client" $clientargs -- "$server" $display $serverargs
+diff --git xinit-1.1.1/xinit.c xinit-1.1.1/xinit.c
+index d25de9d..814d286 100644
+--- xinit-1.1.1/xinit.c
++++ xinit-1.1.1/xinit.c
+@@ -62,7 +62,7 @@ in this Software without prior written authorization from The Open Group.
+
+ #ifdef __APPLE__
+ #include <AvailabilityMacros.h>
+-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+ #include <vproc.h>
+ #endif
+ #endif
+@@ -258,7 +258,7 @@ main(int argc, char *argv[], char *envp[])
+ int start_of_client_args, start_of_server_args;
+ struct sigaction sa;
+ #ifdef __APPLE__
+-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+ vproc_transaction_t vt;
+ #endif
+ #endif
+@@ -440,7 +440,7 @@ main(int argc, char *argv[], char *envp[])
+ signal(SIGUSR1, sigUsr1);
+
+ #ifdef __APPLE__
+-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+ vt = vproc_transaction_begin(NULL);
+ #endif
+ #endif
+@@ -455,7 +455,7 @@ main(int argc, char *argv[], char *envp[])
+ }
+
+ #ifdef __APPLE__
+-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+ vproc_transaction_end(NULL, vt);
+ #endif
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090609/1b476f53/attachment.html>
More information about the macports-changes
mailing list