6 files changed, 83 insertions, 44 deletions

diff --git a/devel/libcheck/Makefile b/devel/libcheck/Makefile
index 01c3bd5be6c7..cb6182686bc1 100644
--- a/devel/libcheck/Makefile
+++ b/devel/libcheck/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libcheck
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	check
diff --git a/devel/libcheck/distinfo b/devel/libcheck/distinfo
index 55244750ed45..821f3b485591 100644
--- a/devel/libcheck/distinfo
+++ b/devel/libcheck/distinfo
@@ -1,3 +1,2 @@
-MD5 (check-0.9.3.tar.gz) = 6e5870f7c9c5414572158d8005e91d68
-SHA256 (check-0.9.3.tar.gz) = c3fb9582e7df33a4e854cd22f2a7e3ef417877cb85b651d766c01c730115e083
-SIZE (check-0.9.3.tar.gz) = 163726
+MD5 (check-0.9.5.tar.gz) = 30143c7974b547a12a7da47809a90951
+SIZE (check-0.9.5.tar.gz) = 520625
diff --git a/devel/libcheck/files/patch-Makefile.in b/devel/libcheck/files/patch-Makefile.in
index 9641cb730f00..5d83b9a308b2 100644
--- a/devel/libcheck/files/patch-Makefile.in
+++ b/devel/libcheck/files/patch-Makefile.in
@@ -1,20 +1,24 @@
---- Makefile.in.orig	Sun Jul  2 20:15:13 2006
-+++ Makefile.in	Sun Jul  2 20:15:30 2006
-@@ -77,7 +77,7 @@
- @PLAIN_DOCDIR_FALSE@DOCROOTDIR = $(prefix)/share/doc/${PACKAGE}-${VERSION}
- docdir = $(DOCROOTDIR)
+--- Makefile.in.orig	Tue Nov 21 18:19:11 2006
++++ Makefile.in	Fri Dec  1 21:41:18 2006
+@@ -38,8 +38,8 @@
+ host_triplet = @host@
+ 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 \
+-	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,8 +203,8 @@
+ 	ChangeLog.bak
  
--doc_DATA = ChangeLog ChangeLogOld NEWS README COPYING
-+doc_DATA = ChangeLog ChangeLogOld NEWS README
- 
- SUBDIRS = src tests doc rpm debian
- 
-@@ -94,7 +94,7 @@
- CONFIG_CLEAN_FILES = 
- DATA =  $(doc_DATA) $(m4data_DATA)
- 
--DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
-+DIST_COMMON =  README ./stamp-h.in AUTHORS ChangeLog INSTALL \
- Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 config.guess \
- config.h.in config.sub configure configure.in install-sh missing \
- mkinstalldirs
+ 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
diff --git a/devel/libcheck/files/patch-doc+Makefile.in b/devel/libcheck/files/patch-doc+Makefile.in
new file mode 100644
index 000000000000..b40f595bb727
--- /dev/null
+++ b/devel/libcheck/files/patch-doc+Makefile.in
@@ -0,0 +1,21 @@
+--- 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 --git a/devel/libcheck/files/patch-doc+money+Makefile.in b/devel/libcheck/files/patch-doc+money+Makefile.in
deleted file mode 100644
index 98744ad075bf..000000000000
--- a/devel/libcheck/files/patch-doc+money+Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/money/Makefile.in.orig	Sun Jul  2 20:23:16 2006
-+++ doc/money/Makefile.in	Sun Jul  2 20:24:13 2006
-@@ -75,7 +75,7 @@
- have_docbook2html = @have_docbook2html@
- @PLAIN_DOCDIR_TRUE@DOCROOTDIR = $(prefix)/share/doc/$(PACKAGE)
- @PLAIN_DOCDIR_FALSE@DOCROOTDIR = $(prefix)/share/doc/${PACKAGE}-${VERSION}
--exampledocdir = $(DOCROOTDIR)/examples
-+exampledocdir = $(prefix)/share/examples/${PACKAGE}-${VERSION}
- 
- example_docs =  	money.h 	money.c 	check_money.c 	configure.in.money 	Makefile.am.money
- 
diff --git a/devel/libcheck/pkg-plist b/devel/libcheck/pkg-plist
index e4b3419a3f2b..64484edaa6a1 100644
--- a/devel/libcheck/pkg-plist
+++ b/devel/libcheck/pkg-plist
@@ -1,15 +1,41 @@
-%%EXAMPLESDIR%%/money.h
-%%EXAMPLESDIR%%/money.c
-%%EXAMPLESDIR%%/check_money.c
-%%EXAMPLESDIR%%/configure.in.money
-%%EXAMPLESDIR%%/Makefile.am.money
-%%PORTDOCS%%%%DOCSDIR%%/tutorial.sgml
+include/check.h
+info/check.info
+info/dir
+lib/libcheck.so.0
+lib/libcheck.so
+lib/libcheck.la
+lib/libcheck.a
+lib/pkgconfig/check.pc
+share/aclocal/check.m4
+%%EXAMPLESDIR%%/Makefile.am
+%%EXAMPLESDIR%%/README
+%%EXAMPLESDIR%%/configure.ac
+%%EXAMPLESDIR%%/src/Makefile.am
+%%EXAMPLESDIR%%/src/main.c
+%%EXAMPLESDIR%%/src/money.c
+%%EXAMPLESDIR%%/src/money.h
+%%EXAMPLESDIR%%/src/money.1.h
+%%EXAMPLESDIR%%/src/money.2.h
+%%EXAMPLESDIR%%/src/money.1.c
+%%EXAMPLESDIR%%/src/money.3.c
+%%EXAMPLESDIR%%/src/money.4.c
+%%EXAMPLESDIR%%/src/money.5.c
+%%EXAMPLESDIR%%/src/money.6.c
+@dirrm %%EXAMPLESDIR%%/src
+%%EXAMPLESDIR%%/tests/Makefile.am
+%%EXAMPLESDIR%%/tests/check_money.c
+%%EXAMPLESDIR%%/tests/check_money.1.c
+%%EXAMPLESDIR%%/tests/check_money.2.c
+%%EXAMPLESDIR%%/tests/check_money.3.c
+%%EXAMPLESDIR%%/tests/check_money.6.c
+%%EXAMPLESDIR%%/tests/check_money.7.c
+@dirrm %%EXAMPLESDIR%%/tests
+%%PORTDOCS%%%%DOCSDIR%%/SVNChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLogOld
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-share/aclocal/check.m4
-include/check.h
-lib/libcheck.a
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
+share/nls/POSIX
+share/nls/en_US.US-ASCII
 @dirrm %%EXAMPLESDIR%%