[117216] trunk/dports/devel/upower
devans at macports.org
devans at macports.org
Wed Feb 19 09:08:33 PST 2014
Revision: 117216
https://trac.macports.org/changeset/117216
Author: devans at macports.org
Date: 2014-02-19 09:08:33 -0800 (Wed, 19 Feb 2014)
Log Message:
-----------
upower: reconfigure with our intltool.m4 using autogen.sh from upstream git, build deps.
Modified Paths:
--------------
trunk/dports/devel/upower/Portfile
Added Paths:
-----------
trunk/dports/devel/upower/files/autogen.sh
trunk/dports/devel/upower/files/patch-configure.ac.diff
trunk/dports/devel/upower/files/patch-doc-man-Makefile.am.diff
Removed Paths:
-------------
trunk/dports/devel/upower/files/patch-configure.diff
trunk/dports/devel/upower/files/patch-doc-man-Makefile.in.diff
Modified: trunk/dports/devel/upower/Portfile
===================================================================
--- trunk/dports/devel/upower/Portfile 2014-02-19 16:32:10 UTC (rev 117215)
+++ trunk/dports/devel/upower/Portfile 2014-02-19 17:08:33 UTC (rev 117216)
@@ -28,7 +28,10 @@
depends_build port:pkgconfig \
port:intltool \
port:gtk-doc \
- port:libxslt
+ port:libxslt \
+ port:autoconf \
+ port:automake \
+ port:libtool
# upower uses xsltproc; using /usr/bin/xsltproc will fail without
# XML_CATALOG_FILES set because it'll attempt to download the DTDs. This
@@ -39,9 +42,17 @@
port:gobject-introspection \
port:policykit
-patchfiles patch-configure.diff \
- patch-doc-man-Makefile.in.diff
+patchfiles patch-configure.ac.diff \
+ patch-doc-man-Makefile.am.diff
+# reconfigure with our intltool.m4 using autogen.sh from upstream git
+
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd ./autogen.sh
+
configure.args --enable-deprecated \
--enable-introspection \
--disable-silent-rules
Added: trunk/dports/devel/upower/files/autogen.sh
===================================================================
--- trunk/dports/devel/upower/files/autogen.sh (rev 0)
+++ trunk/dports/devel/upower/files/autogen.sh 2014-02-19 17:08:33 UTC (rev 117216)
@@ -0,0 +1,34 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+cd $srcdir
+
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+ echo "*** No autoreconf found, please intall it ***"
+ exit 1
+fi
+
+INTLTOOLIZE=`which intltoolize`
+if test -z $INTLTOOLIZE; then
+ echo "*** No intltoolize found, please install the intltool package ***"
+ exit 1
+fi
+
+GTKDOCIZE=`which gtkdocize`
+if test -z $GTKDOCIZE; then
+ echo "*** No GTK-Doc found, please install it ***"
+ exit 1
+fi
+
+gtkdocize
+autopoint --force
+AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
+
+cd $olddir
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
+
Added: trunk/dports/devel/upower/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/devel/upower/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/devel/upower/files/patch-configure.ac.diff 2014-02-19 17:08:33 UTC (rev 117216)
@@ -0,0 +1,15 @@
+--- configure.ac.orig 2013-10-18 07:59:43.000000000 -0700
++++ configure.ac 2014-02-19 07:40:53.000000000 -0800
+@@ -222,9 +222,9 @@
+ enable_tests=$enableval,enable_tests=yes)
+ AM_CONDITIONAL(UP_BUILD_TESTS, test x$enable_tests = xyes)
+
+-if test "x$GCC" = "xyes"; then
+- LDFLAGS="-Wl,--as-needed $LDFLAGS"
+-fi
++#if test "x$GCC" = "xyes"; then
++# LDFLAGS="-Wl,--as-needed $LDFLAGS"
++##fi
+
+ # i18n support
+ IT_PROG_INTLTOOL([0.40.0])
Deleted: trunk/dports/devel/upower/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/upower/files/patch-configure.diff 2014-02-19 16:32:10 UTC (rev 117215)
+++ trunk/dports/devel/upower/files/patch-configure.diff 2014-02-19 17:08:33 UTC (rev 117216)
@@ -1,15 +0,0 @@
---- configure.orig 2013-07-26 07:51:48.000000000 -0700
-+++ configure 2013-07-26 21:43:15.000000000 -0700
-@@ -13692,9 +13692,9 @@
- fi
-
-
--if test "x$GCC" = "xyes"; then
-- LDFLAGS="-Wl,--as-needed $LDFLAGS"
--fi
-+#if test "x$GCC" = "xyes"; then
-+# LDFLAGS="-Wl,--as-needed $LDFLAGS"
-+##fi
-
- # i18n support
-
Added: trunk/dports/devel/upower/files/patch-doc-man-Makefile.am.diff
===================================================================
--- trunk/dports/devel/upower/files/patch-doc-man-Makefile.am.diff (rev 0)
+++ trunk/dports/devel/upower/files/patch-doc-man-Makefile.am.diff 2014-02-19 17:08:33 UTC (rev 117216)
@@ -0,0 +1,12 @@
+--- doc/man/Makefile.am.orig 2014-02-19 08:20:10.000000000 -0800
++++ doc/man/Makefile.am 2014-02-19 08:21:12.000000000 -0800
+@@ -2,8 +2,7 @@
+
+ man_MANS = \
+ upower.1 \
+- upowerd.8 \
+- UPower.7
++ upowerd.8
+
+ %.1 %.7 %.8 : %.xml
+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
Deleted: trunk/dports/devel/upower/files/patch-doc-man-Makefile.in.diff
===================================================================
--- trunk/dports/devel/upower/files/patch-doc-man-Makefile.in.diff 2014-02-19 16:32:10 UTC (rev 117215)
+++ trunk/dports/devel/upower/files/patch-doc-man-Makefile.in.diff 2014-02-19 17:08:33 UTC (rev 117216)
@@ -1,12 +0,0 @@
---- doc/man/Makefile.in.orig 2013-07-26 07:51:47.000000000 -0700
-+++ doc/man/Makefile.in 2013-07-26 21:30:13.000000000 -0700
-@@ -348,8 +348,7 @@
- udevrulesdir = @udevrulesdir@
- @MAN_PAGES_ENABLED_TRUE at man_MANS = \
- @MAN_PAGES_ENABLED_TRUE@ upower.1 \
-- at MAN_PAGES_ENABLED_TRUE@ upowerd.8 \
-- at MAN_PAGES_ENABLED_TRUE@ UPower.7
-+ at MAN_PAGES_ENABLED_TRUE@ upowerd.8
-
- @MAN_PAGES_ENABLED_TRUE at MAINTAINERCLEANFILES = $(man_MANS)
- EXTRA_DIST = \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140219/87544c5d/attachment.html>
More information about the macports-changes
mailing list