[104072] trunk/dports/devel/log4cpp

[ryandesign at macports.org]

Revision: 104072
          https://trac.macports.org/changeset/104072
Author:   ryandesign at macports.org
Date:     2013-03-14 12:23:45 -0700 (Thu, 14 Mar 2013)
Log Message:
-----------
log4cpp: add required build dependencies on autoconf, automake and libtool; convert reinplaces to patchfiles; add more checksum types; revert the part of r104063 that reverted r90695 and once again rewrite master_sites to avoid redirects

Revision Links:
--------------
    https://trac.macports.org/changeset/104063
    https://trac.macports.org/changeset/90695

Modified Paths:
--------------
    trunk/dports/devel/log4cpp/Portfile

Added Paths:
-----------
    trunk/dports/devel/log4cpp/files/
    trunk/dports/devel/log4cpp/files/patch-autoconf-1.13.diff
    trunk/dports/devel/log4cpp/files/patch-autogen.sh.diff

Modified: trunk/dports/devel/log4cpp/Portfile
===================================================================
--- trunk/dports/devel/log4cpp/Portfile	2013-03-14 19:19:20 UTC (rev 104071)
+++ trunk/dports/devel/log4cpp/Portfile	2013-03-14 19:23:45 UTC (rev 104072)
@@ -5,6 +5,7 @@
 
 name                log4cpp
 version             1.1
+set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel
 platforms           darwin
 license             LGPL-2.1
@@ -18,22 +19,26 @@
                     API as is reasonable.
 
 homepage            http://log4cpp.sourceforge.net/
-master_sites        sourceforge
+master_sites        sourceforge:project/log4cpp/log4cpp-${branch}.x%20%28new%29/log4cpp-${version}
 
-checksums           sha1 6003105dd11b1fe6f0f88b5bc42c86cccd78d5ae
+checksums           sha1    6003105dd11b1fe6f0f88b5bc42c86cccd78d5ae \
+                    rmd160  555ba3b8b8f0e38ed6c39d817d0ba0c1b42bee6a \
+                    sha256  c25bd1e0abd47a5dee2ab49b84cbce6292fcada90536a26a5fc9999d343768b4
 
+depends_build       port:autoconf \
+                    port:automake \
+                    port:libtool
+
 worksrcdir         ${name}
 
+patchfiles          patch-autogen.sh.diff \
+                    patch-autoconf-1.13.diff
+
 use_autoconf        yes
 autoconf.cmd       ${worksrcpath}/autogen.sh
 
 post-extract {
     move ${worksrcpath}/configure.in ${worksrcpath}/configure.ac
-    reinplace "s at AM_CONFIG_HEADER@AC_CONFIG_HEADERS at g" \
-        ${worksrcpath}/configure.ac
-    reinplace "s at libtoolize@glibtoolize at g" ${worksrcpath}/autogen.sh
-    reinplace "s at INCLUDES@AM_CPPFLAGS at g" ${worksrcpath}/src/Makefile.am
-    reinplace "s at INCLUDES@AM_CPPFLAGS at g" ${worksrcpath}/tests/Makefile.am
 }
 
 # docs do not honor DESTDIR; keep them disabled for now

Added: trunk/dports/devel/log4cpp/files/patch-autoconf-1.13.diff
===================================================================
--- trunk/dports/devel/log4cpp/files/patch-autoconf-1.13.diff	                        (rev 0)
+++ trunk/dports/devel/log4cpp/files/patch-autoconf-1.13.diff	2013-03-14 19:23:45 UTC (rev 104072)
@@ -0,0 +1,32 @@
+--- configure.ac.orig	2009-09-07 15:57:46.000000000 -0500
++++ configure.ac	2013-03-14 14:14:21.000000000 -0500
+@@ -17,7 +17,7 @@
+ 
+ #AC_CONFIG_SRCDIR(configure.in)
+ AC_CONFIG_AUX_DIR(config)
+-AM_CONFIG_HEADER(include/config.h)
++AC_CONFIG_HEADERS(include/config.h)
+ 
+ AM_INIT_AUTOMAKE
+ 
+--- src/Makefile.am.orig	2007-08-25 04:42:07.000000000 -0500
++++ src/Makefile.am	2013-03-14 14:14:21.000000000 -0500
+@@ -1,6 +1,6 @@
+ lib_LTLIBRARIES = liblog4cpp.la
+ 
+-INCLUDES = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+ noinst_HEADERS = snprintf.c Localtime.hh
+ 
+--- tests/Makefile.am.orig	2003-05-09 18:53:49.000000000 -0500
++++ tests/Makefile.am	2013-03-14 14:14:21.000000000 -0500
+@@ -12,7 +12,7 @@
+ 
+ noinst_PROGRAMS = testmain testbench
+ 
+-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
+ 
+ testmain_SOURCES = testmain.cpp
+ testmain_LDADD = $(top_builddir)/src/liblog4cpp.la

Added: trunk/dports/devel/log4cpp/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/devel/log4cpp/files/patch-autogen.sh.diff	                        (rev 0)
+++ trunk/dports/devel/log4cpp/files/patch-autogen.sh.diff	2013-03-14 19:23:45 UTC (rev 104072)
@@ -0,0 +1,11 @@
+--- autogen.sh.orig	2001-10-03 17:14:39.000000000 -0500
++++ autogen.sh	2013-03-14 14:14:21.000000000 -0500
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ echo "Adding libtools."
+-libtoolize --force --automake
++glibtoolize --force --automake
+ 
+ echo "Building macros."
+ aclocal -I m4 $ACLOCAL_FLAGS
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130314/cf262ed6/attachment.html>