9 files changed, 79 insertions, 55 deletions

diff --git a/devel/libcheck/Makefile b/devel/libcheck/Makefile
index 2ae65403a42d..01c3bd5be6c7 100644
--- a/devel/libcheck/Makefile
+++ b/devel/libcheck/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libcheck
-PORTVERSION=	0.9.2
+PORTVERSION=	0.9.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	check
@@ -17,5 +17,9 @@ COMMENT=	A unit test framework for C
 
 GNU_CONFIGURE=	yes
 PLIST_SUB=	CHECK_VERSION=${PORTVERSION}
+USE_GMAKE=	yes
+
+DOCSDIR=	${PREFIX}/share/doc/check-${PORTVERSION}
+EXAMPLESDIR=	${PREFIX}/share/examples/check-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/libcheck/distinfo b/devel/libcheck/distinfo
index aa95136473ac..55244750ed45 100644
--- a/devel/libcheck/distinfo
+++ b/devel/libcheck/distinfo
@@ -1,3 +1,3 @@
-MD5 (check-0.9.2.tar.gz) = 9a4d5665b8be07513f5ac4e6eec537e6
-SHA256 (check-0.9.2.tar.gz) = fbd7a0595eba5cf0cb168d9893e883f5cc7a68a7d6fec23cb3688508b247fa22
-SIZE (check-0.9.2.tar.gz) = 161604
+MD5 (check-0.9.3.tar.gz) = 6e5870f7c9c5414572158d8005e91d68
+SHA256 (check-0.9.3.tar.gz) = c3fb9582e7df33a4e854cd22f2a7e3ef417877cb85b651d766c01c730115e083
+SIZE (check-0.9.3.tar.gz) = 163726
diff --git a/devel/libcheck/files/patch-Makefile.in b/devel/libcheck/files/patch-Makefile.in
new file mode 100644
index 000000000000..9641cb730f00
--- /dev/null
+++ b/devel/libcheck/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- 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)
+ 
+-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
diff --git a/devel/libcheck/files/patch-aa b/devel/libcheck/files/patch-aa
deleted file mode 100644
index 2e4bdfbdd487..000000000000
--- a/devel/libcheck/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/check.h.in.orig	Sun Nov 14 23:01:22 2004
-+++ src/check.h.in	Sun Nov 14 23:01:36 2004
-@@ -168,7 +168,7 @@
- /* Fail the test case if expr is true */
- #define fail_if(expr, ...)\
-         _fail_unless(!(expr), __FILE__, __LINE__,\
--        "Failure '"#expr"' occured", ## __VA_ARGS__, NULL)
-+        "Failure '"#expr"' occured" , ## __VA_ARGS__, NULL)
- 
- /* Always fail */
- #define fail(...) _fail_unless(0, __FILE__, __LINE__, "Failed" , ## __VA_ARGS__, NULL)
diff --git a/devel/libcheck/files/patch-ab b/devel/libcheck/files/patch-ab
deleted file mode 100644
index 15e790bbba9f..000000000000
--- a/devel/libcheck/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/check_pack.c.orig	Sun Nov 14 22:55:22 2004
-+++ src/check_pack.c	Sun Nov 14 22:55:39 2004
-@@ -24,7 +24,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <unistd.h>
--#include <stdint.h>
-+/* #include <stdint.h> */
- 
- #include "check.h"
- #include "check_error.h"
diff --git a/devel/libcheck/files/patch-check.m4 b/devel/libcheck/files/patch-check.m4
new file mode 100644
index 000000000000..2c4f122ea7a7
--- /dev/null
+++ b/devel/libcheck/files/patch-check.m4
@@ -0,0 +1,26 @@
+--- check.m4.orig	Tue Mar  1 01:25:26 2005
++++ check.m4	Sun Jul  2 21:13:20 2006
+@@ -19,8 +19,21 @@
+       CHECK_CFLAGS="-I$with_check/include"
+       CHECK_LIBS="-L$with_check/lib -lcheck"
+     else
+-      CHECK_CFLAGS=""
+-      CHECK_LIBS="-lcheck"
++      for check_includedir in /usr/local/include /usr/local/include/check /usr/include $prefix/include
++      do
++        if test -e $check_includedir/check.h ; then
++          CHECK_CFLAGS="-I${check_includedir}"
++          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
++          CHECK_LIBS="-L${check_libdir} -lcheck"
++          break
++        fi
++      done
+     fi
+ 
+     ac_save_CFLAGS="$CFLAGS"
diff --git a/devel/libcheck/files/patch-doc+money+Makefile.in b/devel/libcheck/files/patch-doc+money+Makefile.in
new file mode 100644
index 000000000000..98744ad075bf
--- /dev/null
+++ b/devel/libcheck/files/patch-doc+money+Makefile.in
@@ -0,0 +1,11 @@
+--- 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-descr b/devel/libcheck/pkg-descr
index 77296e616a9d..4015a2db9a88 100644
--- a/devel/libcheck/pkg-descr
+++ b/devel/libcheck/pkg-descr
@@ -2,21 +2,7 @@ Check is a unit test framework for C. It features a simple interface
 for defining unit tests, putting little in the way of the
 developer. Tests are run in a separate address space, so Check can
 catch both assertion failures and code errors that cause segmentation
-faults or other signals. The output from unit tests can be used within
-source code editors and IDEs.
-
-Check was inspired by similar frameworks that currently exist for most
-programming languages; the most famous example being JUnit for Java
-(www.junit.org). There is a list of unit test frameworks for multiple
-languages at www.xprogramming.com/software.htm . Unit testing has a
-long history as part of formal quality assurance methodologies, but
-has recently been associated with the lightweight methodology called
-Extreme Programming. In that methodology, the characteristic practice
-involves interspersing unit test writing with coding (" test a little,
-code a little"). While the incremental unit test/code approach is
-indispensable to Extreme Programming, it is also applicable, and
-perhaps indispensable, outside of that methodology.
-
+faults or other signals.
 
 WWW: http://check.sourceforge.net
 
diff --git a/devel/libcheck/pkg-plist b/devel/libcheck/pkg-plist
index 40eb7c08ad5c..e4b3419a3f2b 100644
--- a/devel/libcheck/pkg-plist
+++ b/devel/libcheck/pkg-plist
@@ -1,16 +1,15 @@
+%%EXAMPLESDIR%%/money.h
+%%EXAMPLESDIR%%/money.c
+%%EXAMPLESDIR%%/check_money.c
+%%EXAMPLESDIR%%/configure.in.money
+%%EXAMPLESDIR%%/Makefile.am.money
+%%PORTDOCS%%%%DOCSDIR%%/tutorial.sgml
+%%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
-share/aclocal/check.m4
-share/doc/check-%%CHECK_VERSION%%/COPYING
-share/doc/check-%%CHECK_VERSION%%/ChangeLog
-share/doc/check-%%CHECK_VERSION%%/ChangeLogOld
-share/doc/check-%%CHECK_VERSION%%/NEWS
-share/doc/check-%%CHECK_VERSION%%/README
-share/doc/check-%%CHECK_VERSION%%/examples/Makefile.am.money
-share/doc/check-%%CHECK_VERSION%%/examples/check_money.c
-share/doc/check-%%CHECK_VERSION%%/examples/configure.in.money
-share/doc/check-%%CHECK_VERSION%%/examples/money.c
-share/doc/check-%%CHECK_VERSION%%/examples/money.h
-share/doc/check-%%CHECK_VERSION%%/tutorial.sgml
-@dirrm share/doc/check-%%CHECK_VERSION%%/examples
-@dirrm share/doc/check-%%CHECK_VERSION%%
+@dirrm %%EXAMPLESDIR%%