[117644] trunk/dports/gnome/devhelp

devans at macports.org devans at macports.org
Thu Mar 6 16:14:42 PST 2014


Revision: 117644
          https://trac.macports.org/changeset/117644
Author:   devans at macports.org
Date:     2014-03-06 16:14:42 -0800 (Thu, 06 Mar 2014)
Log Message:
-----------
devhelp: use upstream autogen.sh to reconfigure with our intltool.m4, build deps, update post-activate.

Modified Paths:
--------------
    trunk/dports/gnome/devhelp/Portfile

Added Paths:
-----------
    trunk/dports/gnome/devhelp/files/autogen.sh
    trunk/dports/gnome/devhelp/files/patch-configure.ac.diff

Removed Paths:
-------------
    trunk/dports/gnome/devhelp/files/patch-configure.diff

Modified: trunk/dports/gnome/devhelp/Portfile
===================================================================
--- trunk/dports/gnome/devhelp/Portfile	2014-03-06 21:40:44 UTC (rev 117643)
+++ trunk/dports/gnome/devhelp/Portfile	2014-03-07 00:14:42 UTC (rev 117644)
@@ -26,10 +26,12 @@
 checksums       rmd160  8d855f485742a0bdc766591d36af09bdbea61801 \
                 sha256  a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7
 
-patchfiles      patch-configure.diff
-
 depends_build   port:pkgconfig \
-                port:intltool
+                port:intltool \
+                port:gnome-common \
+                port:autoconf \
+                port:automake \
+                port:libtool
 
 depends_lib     port:desktop-file-utils \
                 port:gnome-icon-theme \
@@ -57,6 +59,17 @@
     }
 }
 
+patchfiles  patch-configure.ac.diff
+
+# use upstream autogen.sh to update m4/intltool.m4 using intltoolize and autoreconf
+
+post-patch {
+    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+    copy ${worksrcpath}/libgd/libgd.m4 ${worksrcpath}/m4
+}
+
+configure.cmd   ./autogen.sh
+
 configure.args  --with-webkit2=no \
                 --disable-schemas-compile
 
@@ -75,7 +88,7 @@
 }
 
 post-activate {
-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }

Added: trunk/dports/gnome/devhelp/files/autogen.sh
===================================================================
--- trunk/dports/gnome/devhelp/files/autogen.sh	                        (rev 0)
+++ trunk/dports/gnome/devhelp/files/autogen.sh	2014-03-07 00:14:42 UTC (rev 117644)
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="Devhelp"
+ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS"
+
+(test -f $srcdir/src/dh-main.c) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common."
+    exit 1
+}
+
+. gnome-autogen.sh

Added: trunk/dports/gnome/devhelp/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/devhelp/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/gnome/devhelp/files/patch-configure.ac.diff	2014-03-07 00:14:42 UTC (rev 117644)
@@ -0,0 +1,13 @@
+--- configure.ac.orig	2014-03-06 15:51:48.000000000 -0800
++++ configure.ac	2014-03-06 15:52:52.000000000 -0800
+@@ -96,8 +96,8 @@
+ # i18n stuff
+ IT_PROG_INTLTOOL([0.40.0])
+ 
+-AM_GNU_GETTEXT_VERSION([0.17])
+-AM_GNU_GETTEXT([external])
++#AM_GNU_GETTEXT_VERSION([0.17])
++#AM_GNU_GETTEXT([external])
+ 
+ GETTEXT_PACKAGE=devhelp
+ AC_SUBST(GETTEXT_PACKAGE)

Deleted: trunk/dports/gnome/devhelp/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/devhelp/files/patch-configure.diff	2014-03-06 21:40:44 UTC (rev 117643)
+++ trunk/dports/gnome/devhelp/files/patch-configure.diff	2014-03-07 00:14:42 UTC (rev 117644)
@@ -1,14 +0,0 @@
---- configure.orig	2013-05-15 04:07:33.000000000 -0700
-+++ configure	2013-08-03 06:37:28.000000000 -0700
-@@ -15341,9 +15341,9 @@
- 
- 
- 
--  PYTHON_PREFIX='${prefix}'
-+  PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
- 
--  PYTHON_EXEC_PREFIX='${exec_prefix}'
-+  PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
- 
- 
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140306/2a5d9a92/attachment-0001.html>


More information about the macports-changes mailing list