[129149] trunk/dports/devel/cunit

[jmr at macports.org]

Revision: 129149
          https://trac.macports.org/changeset/129149
Author:   jmr at macports.org
Date:     2014-12-07 11:37:30 -0800 (Sun, 07 Dec 2014)
Log Message:
-----------
cunit: update to 2.1-3

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

Added Paths:
-----------
    trunk/dports/devel/cunit/files/Sources_Makefile.am.diff
    trunk/dports/devel/cunit/files/doc_Makefile.am.diff

Removed Paths:
-------------
    trunk/dports/devel/cunit/files/patch-doc_Makefile.in.diff

Modified: trunk/dports/devel/cunit/Portfile
===================================================================
--- trunk/dports/devel/cunit/Portfile	2014-12-07 19:12:10 UTC (rev 129148)
+++ trunk/dports/devel/cunit/Portfile	2014-12-07 19:37:30 UTC (rev 129149)
@@ -3,8 +3,7 @@
 PortSystem          1.0
 
 name                cunit
-version             2.1-2
-revision            1
+version             2.1-3
 categories          devel
 license             LGPL
 maintainers         nomaintainer
@@ -18,25 +17,24 @@
 
 homepage            http://cunit.sourceforge.net/
 master_sites        sourceforge:project/cunit/CUnit/${version}
-distname            CUnit-${version}-src
+distname            CUnit-${version}
 use_bzip2           yes
-worksrcdir          [strsed ${distname} {s/-src$//}]
 
-checksums           md5     31c62bd7a65007737ba28b7aafc44d3a \
-                    sha1    6c2d0627eb64c09c7140726d6bf814cf531a3ce0 \
-                    rmd160  1da78d739d1036c4a70caa1479171388e228953e
+checksums           md5     b5f1a9f6093869c070c6e4a9450cc10c \
+                    sha1    eac0c71167aa3fab83483ae1313b78163f0f7238 \
+                    rmd160  c9d74d5406fb5fed0d61cfd5fee12a4d77d7e2cc
 
 depends_lib         port:ncurses
 
-patchfiles          patch-doc_Makefile.in.diff \
-                    patch-cunit_sources_curses_curses.c.diff
+patchfiles          patch-cunit_sources_curses_curses.c.diff \
+                    Sources_Makefile.am.diff \
+                    doc_Makefile.am.diff
 
-configure.args      --enable-curses \
-                    --mandir=${prefix}/share/man
-configure.env-append  LIBS=-lncurses
+use_autoreconf      yes
+configure.args      --enable-curses
 
 post-destroot {
-   # For some reason CUnit has a headers/ subdir in doc/ which just repeats
+   # For some reason CUnit has a ${prefix}/doc/headers/ which just repeats
    # the headers already in include/ (plus Win.h which we don't need)
    delete ${destroot}${prefix}/doc
 }

Added: trunk/dports/devel/cunit/files/Sources_Makefile.am.diff
===================================================================
--- trunk/dports/devel/cunit/files/Sources_Makefile.am.diff	                        (rev 0)
+++ trunk/dports/devel/cunit/files/Sources_Makefile.am.diff	2014-12-07 19:37:30 UTC (rev 129149)
@@ -0,0 +1,12 @@
+--- CUnit/Sources/Makefile.am.orig	2014-04-24 10:54:45.000000000 +1000
++++ CUnit/Sources/Makefile.am	2014-12-08 06:19:32.000000000 +1100
+@@ -67,6 +67,9 @@
+ lib_LTLIBRARIES = libcunit.la
+ libcunit_la_SOURCES = 
+ libcunit_la_LIBADD = $(OBJECT_FILES_SHARED)
++if ENABLE_CURSES
++libcunit_la_LIBADD += -l$(CURSES_LIB)
++endif
+ libcunit_la_LDFLAGS = -version-info @LIBTOOL_CURRENT@:@LIBTOOL_REVISION@:@LIBTOOL_AGE@
+ 
+ 

Added: trunk/dports/devel/cunit/files/doc_Makefile.am.diff
===================================================================
--- trunk/dports/devel/cunit/files/doc_Makefile.am.diff	                        (rev 0)
+++ trunk/dports/devel/cunit/files/doc_Makefile.am.diff	2014-12-07 19:37:30 UTC (rev 129149)
@@ -0,0 +1,17 @@
+--- doc/Makefile.am.orig	2014-04-24 10:54:45.000000000 +1000
++++ doc/Makefile.am	2014-12-08 06:28:00.000000000 +1100
+@@ -1,7 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-docdir = $(prefix)/doc/@PACKAGE@
+-
+ doc_DATA = \
+ 	CUnit_doc.css \
+ 	error_handling.html \
+@@ -13,4 +11,4 @@
+ 	test_registry.html \
+ 	writing_tests.html
+ 
+-SUBDIRS = headers
+\ No newline at end of file
++SUBDIRS = headers

Deleted: trunk/dports/devel/cunit/files/patch-doc_Makefile.in.diff
===================================================================
--- trunk/dports/devel/cunit/files/patch-doc_Makefile.in.diff	2014-12-07 19:12:10 UTC (rev 129148)
+++ trunk/dports/devel/cunit/files/patch-doc_Makefile.in.diff	2014-12-07 19:37:30 UTC (rev 129149)
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	2010-10-16 02:11:42.000000000 +1100
-+++ doc/Makefile.in	2011-01-10 14:52:01.000000000 +1100
-@@ -207,7 +207,7 @@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(prefix)/doc/@PACKAGE@
-+docdir = $(prefix)/share/doc/@PACKAGE@
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141207/868e5eaf/attachment.html>