Date: Wed, 7 Jan 2009 09:32:28 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/130249: [PATCH] devel/libcheck: update to 0.9.6, take maintainership Message-ID: <20090107013228.55C242AE0@sunpoet.net> Resent-Message-ID: <200901070140.n071e1Vj080593@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 130249
>Category: ports
>Synopsis: [PATCH] devel/libcheck: update to 0.9.6, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 07 01:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 7.1-STABLE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 7.1-STABLE FreeBSD 7.1-STABLE #5: Tue Jan 6 00:12:11 CST
>Description:
- Update to 0.9.6
- Take maintainership
- Make portlint happier
Added file(s):
- files/patch-doc-Makefile.in
Removed file(s):
- files/patch-doc+Makefile.in
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- libcheck-0.9.6.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/libcheck/Makefile /usr/ports/sunpoet/libcheck/Makefile
--- /usr/ports/devel/libcheck/Makefile 2008-11-05 02:23:47.012112584 +0800
+++ /usr/ports/sunpoet/libcheck/Makefile 2009-01-07 09:23:57.767323057 +0800
@@ -6,13 +6,12 @@
#
PORTNAME= libcheck
-PORTVERSION= 0.9.5
-PORTREVISION= 1
+PORTVERSION= 0.9.6
CATEGORIES= devel
MASTER_SITES= SF/check
DISTNAME= check-${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= sunpoet@sunpoet.net
COMMENT= A unit test framework for C
GNU_CONFIGURE= yes
@@ -23,18 +22,21 @@
DOCSDIR= ${PREFIX}/share/doc/check-${PORTVERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/check-${PORTVERSION}
+.if !defined(NOPORTDOCS)
INFO= check
+.endif
post-patch:
-.ifdef (NOPORTDOCS)
+.if defined(NOPORTDOCS)
@${REINPLACE_CMD} \
- 's/^install-data-am: install-docDATA/install-data-am:/' \
+ -e '/^install-data-am:/ s/ install-docDATA//' \
${WRKSRC}/Makefile.in
.endif
-.ifdef (NOPORTEXAMPLES)
- @${REINPLACE_CMD} -e \
- 's/^\(install-data-am:\) install-exampleDATA install-examplesrcDATA/\1/; \
- s/.*install-exampletestsDATA \(install-info-am\)/\1/' \
+.if defined(NOPORTEXAMPLES)
+ @${REINPLACE_CMD} \
+ -e '/^install-data-am:/ s/ install-exampleDATA//' \
+ -e '/^install-data-am:/ s/ install-examplesrcDATA//' \
+ -e '/install-exampletestsDATA/ s/ install-info-am//' \
${WRKSRC}/doc/Makefile.in
.endif
diff -ruN --exclude=CVS /usr/ports/devel/libcheck/distinfo /usr/ports/sunpoet/libcheck/distinfo
--- /usr/ports/devel/libcheck/distinfo 2008-03-25 12:38:00.000000000 +0800
+++ /usr/ports/sunpoet/libcheck/distinfo 2009-01-06 00:52:28.915562014 +0800
@@ -1,3 +1,3 @@
-MD5 (check-0.9.5.tar.gz) = 30143c7974b547a12a7da47809a90951
-SHA256 (check-0.9.5.tar.gz) = 961b3c66869018d02226bbbc394e79362cd898962ce810bce8417b3c497f7ad6
-SIZE (check-0.9.5.tar.gz) = 520625
+MD5 (check-0.9.6.tar.gz) = 6f80cd4a24d14ad706117a7714222420
+SHA256 (check-0.9.6.tar.gz) = 09fa3f9eaf7267c4cfaaa54eed795666091ab7af6e6e4cd572c578cf627e569c
+SIZE (check-0.9.6.tar.gz) = 560006
diff -ruN --exclude=CVS /usr/ports/devel/libcheck/files/patch-Makefile.in /usr/ports/sunpoet/libcheck/files/patch-Makefile.in
--- /usr/ports/devel/libcheck/files/patch-Makefile.in 2008-04-07 12:09:47.000000000 +0800
+++ /usr/ports/sunpoet/libcheck/files/patch-Makefile.in 2009-01-07 09:30:30.201231556 +0800
@@ -1,28 +1,33 @@
---- Makefile.in.old 2008-04-03 00:51:55.000000000 -0300
-+++ Makefile.in 2008-04-03 00:52:21.000000000 -0300
-@@ -38,8 +38,8 @@
- host_triplet = @host@
+--- Makefile.in.orig 2008-12-29 22:07:02.000000000 +0800
++++ Makefile.in 2009-01-07 09:00:25.456715144 +0800
+@@ -36,7 +36,7 @@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/check.pc.in \
-- $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
+ $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS \
- COPYING.LESSER ChangeLog INSTALL NEWS THANKS TODO \
-+ $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS \
+ ChangeLog INSTALL NEWS THANKS TODO \
build-aux/compile build-aux/config.guess build-aux/config.sub \
build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
build-aux/mdate-sh build-aux/missing build-aux/texinfo.tex
-@@ -203,11 +203,11 @@
+@@ -174,7 +174,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(datadir)/doc/$(PACKAGE)
++docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+@@ -211,10 +211,10 @@
ChangeLog.bak
EXTRA_DIST = SVNChangeLog ChangeLogOld check.pc.in $(m4data_DATA)
--docdir = $(datadir)/doc/$(PACKAGE)
-doc_DATA = SVNChangeLog ChangeLog ChangeLogOld NEWS README COPYING.LESSER
-+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+doc_DATA = SVNChangeLog ChangeLog ChangeLogOld NEWS README
m4datadir = $(datadir)/aclocal
m4data_DATA = check.m4
-pcdatadir = $(libdir)/pkgconfig
-+pcdatadir = $(prefix)/libdata/pkgconfig
++pcdatadir = $(exec_prefix)/libdata/pkgconfig
pcdata_DATA = check.pc
+ ACLOCAL_AMFLAGS = -I m4
all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
diff -ruN --exclude=CVS /usr/ports/devel/libcheck/files/patch-check.m4 /usr/ports/sunpoet/libcheck/files/patch-check.m4
--- /usr/ports/devel/libcheck/files/patch-check.m4 2006-07-06 02:30:08.000000000 +0800
+++ /usr/ports/sunpoet/libcheck/files/patch-check.m4 2009-01-07 09:03:02.381080951 +0800
@@ -1,6 +1,6 @@
---- check.m4.orig Tue Mar 1 01:25:26 2005
-+++ check.m4 Sun Jul 2 21:13:20 2006
-@@ -19,8 +19,21 @@
+--- check.m4.orig 2008-12-29 21:48:46.000000000 +0800
++++ check.m4 2009-01-07 09:02:41.452952376 +0800
+@@ -21,8 +21,20 @@
CHECK_CFLAGS="-I$with_check/include"
CHECK_LIBS="-L$with_check/lib -lcheck"
else
@@ -13,7 +13,6 @@
+ break
+ fi
+ done
-+
+ for check_libdir in /usr/local/lib /usr/local/lib/check /usr/lib $prefix/lib
+ do
+ if test -e $check_libdir/libcheck.a ; then
diff -ruN --exclude=CVS /usr/ports/devel/libcheck/files/patch-doc+Makefile.in /usr/ports/sunpoet/libcheck/files/patch-doc+Makefile.in
--- /usr/ports/devel/libcheck/files/patch-doc+Makefile.in 2006-12-26 06:42:19.000000000 +0800
+++ /usr/ports/sunpoet/libcheck/files/patch-doc+Makefile.in 1970-01-01 08:00:00.000000000 +0800
@@ -1,21 +0,0 @@
---- doc/Makefile.in.orig Tue Nov 21 18:19:14 2006
-+++ doc/Makefile.in Fri Dec 1 21:57:52 2006
-@@ -220,14 +220,14 @@
- $(example_src_docs) \
- $(example_tests_docs)
-
--docdir = $(datadir)/doc/$(PACKAGE)
-+docdir = $(prefix)/share/examples/${PACKAGE}-${VERSION}
-
- # install money example
--exampledir = $(docdir)/example
-+exampledir = $(docdir)
- example_DATA = $(example_docs)
--examplesrcdir = $(docdir)/example/src
-+examplesrcdir = $(docdir)/src
- examplesrc_DATA = $(example_src_docs)
--exampletestsdir = $(docdir)/example/tests
-+exampletestsdir = $(docdir)/tests
- exampletests_DATA = $(example_tests_docs)
- all: all-am
-
diff -ruN --exclude=CVS /usr/ports/devel/libcheck/files/patch-doc-Makefile.in /usr/ports/sunpoet/libcheck/files/patch-doc-Makefile.in
--- /usr/ports/devel/libcheck/files/patch-doc-Makefile.in 1970-01-01 08:00:00.000000000 +0800
+++ /usr/ports/sunpoet/libcheck/files/patch-doc-Makefile.in 2009-01-07 09:05:47.016875165 +0800
@@ -0,0 +1,26 @@
+--- doc/Makefile.in.orig 2008-12-29 22:19:19.000000000 +0800
++++ doc/Makefile.in 2009-01-07 09:04:30.205795824 +0800
+@@ -159,7 +159,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(datadir)/doc/$(PACKAGE)
++docdir = $(prefix)/share/examples/${PACKAGE}-${VERSION}
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+@@ -227,11 +227,11 @@
+
+
+ # install money example
+-exampledir = $(docdir)/example
++exampledir = $(docdir)
+ example_DATA = $(example_docs)
+-examplesrcdir = $(docdir)/example/src
++examplesrcdir = $(exampledir)/src
+ examplesrc_DATA = $(example_src_docs)
+-exampletestsdir = $(docdir)/example/tests
++exampletestsdir = $(exampledir)/tests
+ exampletests_DATA = $(example_tests_docs)
+ all: all-am
+
diff -ruN --exclude=CVS /usr/ports/devel/libcheck/pkg-plist /usr/ports/sunpoet/libcheck/pkg-plist
--- /usr/ports/devel/libcheck/pkg-plist 2008-04-07 12:09:47.000000000 +0800
+++ /usr/ports/sunpoet/libcheck/pkg-plist 2009-01-07 09:08:32.350431525 +0800
@@ -5,33 +5,33 @@
lib/libcheck.a
libdata/pkgconfig/check.pc
share/aclocal/check.m4
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/configure.ac
-%%PORTDOCS%%%%EXAMPLESDIR%%/src/Makefile.am
-%%PORTDOCS%%%%EXAMPLESDIR%%/src/main.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/src/money.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/src/money.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/src/money.1.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/src/money.2.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/src/money.1.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/src/money.3.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/src/money.4.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/src/money.5.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/src/money.6.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/Makefile.am
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/check_money.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/check_money.1.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/check_money.2.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/check_money.3.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/check_money.6.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/check_money.7.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/configure.ac
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/Makefile.am
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/main.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.1.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.2.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.1.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.3.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.4.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.5.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.6.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/Makefile.am
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/check_money.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/check_money.1.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/check_money.2.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/check_money.3.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/check_money.6.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/check_money.7.c
%%PORTDOCS%%%%DOCSDIR%%/SVNChangeLog
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/ChangeLogOld
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/src
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tests
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/src
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tests
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
--- libcheck-0.9.6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090107013228.55C242AE0>