- Update to 0.9.6

- Make portlint happier
- Pass maintainership to submitter

PR:		ports/130249
Submitted by:	Sunpoet Po-Chuan Hsieh <sunpoet at sunpoet.net>

6 files changed, 70 insertions, 59 deletions

diff --git a/devel/libcheck/Makefile b/devel/libcheck/Makefile
index 03e4e9207e36..c5415481460d 100644
--- a/devel/libcheck/Makefile
+++ b/devel/libcheck/Makefile
@@ -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 @@ USE_LDCONFIG=	yes
 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 --git a/devel/libcheck/distinfo b/devel/libcheck/distinfo
index 3bb9f8630a1a..fb0baa0cb6a3 100644
--- a/devel/libcheck/distinfo
+++ b/devel/libcheck/distinfo
@@ -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 --git a/devel/libcheck/files/patch-Makefile.in b/devel/libcheck/files/patch-Makefile.in
index fece711eb6fd..8426e771c49e 100644
--- a/devel/libcheck/files/patch-Makefile.in
+++ b/devel/libcheck/files/patch-Makefile.in
@@ -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 --git a/devel/libcheck/files/patch-check.m4 b/devel/libcheck/files/patch-check.m4
index 2c4f122ea7a7..a8d6427cc07c 100644
--- a/devel/libcheck/files/patch-check.m4
+++ b/devel/libcheck/files/patch-check.m4
@@ -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 --git a/devel/libcheck/files/patch-doc+Makefile.in b/devel/libcheck/files/patch-doc-Makefile.in
index b40f595bb727..f7b46c43c15b 100644
--- a/devel/libcheck/files/patch-doc+Makefile.in
+++ b/devel/libcheck/files/patch-doc-Makefile.in
@@ -1,21 +1,26 @@
---- 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)
- 
+--- 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 = $(docdir)/src
++examplesrcdir = $(exampledir)/src
  examplesrc_DATA = $(example_src_docs)
 -exampletestsdir = $(docdir)/example/tests
-+exampletestsdir = $(docdir)/tests
++exampletestsdir = $(exampledir)/tests
  exampletests_DATA = $(example_tests_docs)
  all: all-am
  
diff --git a/devel/libcheck/pkg-plist b/devel/libcheck/pkg-plist
index 92f2b813e29a..2c9e0f8a2895 100644
--- a/devel/libcheck/pkg-plist
+++ b/devel/libcheck/pkg-plist
@@ -5,33 +5,33 @@ lib/libcheck.la
 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%%