5 files changed, 77 insertions, 47 deletions

diff --git a/devel/vstr/Makefile b/devel/vstr/Makefile
index ac2ea64e7509..27e999c2225e 100644
--- a/devel/vstr/Makefile
+++ b/devel/vstr/Makefile
@@ -9,14 +9,14 @@ PORTNAME=	vstr
 PORTVERSION=	1.0.15
 CATEGORIES=	devel
 MASTER_SITES=	http://www.and.org/vstr/1.0.15/ \
+		http://www.and.org/vstr/latest/	\
 		http://freebsd.unixfreunde.de/sources/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose string library for C
 
-BROKEN=		fails to patch
-
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig
@@ -24,4 +24,13 @@ INSTALLS_SHLIB=	yes
 
 MAN3=		vstr.3 vstr_const.3
 
+.pre-configure:
+.if defined(NOPORTDOCS)
+	${REINPLACE_CMD} -e 's| Documentation||' ${WRKSRC}/Makefile.in
+.endif
+
+regression-test:
+	(cd ${WRKSRC} &&	\
+	${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
+
 .include <bsd.port.mk>
diff --git a/devel/vstr/files/patch-Documentation_Makefile.in b/devel/vstr/files/patch-Documentation_Makefile.in
new file mode 100644
index 000000000000..b099eebd7de2
--- /dev/null
+++ b/devel/vstr/files/patch-Documentation_Makefile.in
@@ -0,0 +1,20 @@
+--- Documentation/Makefile.in.orig	Tue Mar  7 00:31:23 2006
++++ Documentation/Makefile.in	Fri Jul 21 00:21:22 2006
+@@ -244,7 +244,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-docmaindir = $(datadir)/doc/vstr-devel-$(VERSION)
++docmaindir = $(datadir)/doc/vstr
+ docmain_DATA = \
+                 basic_cat.c.html \
+                 comparison.html \
+@@ -268,7 +268,7 @@
+                 cost_tutorial.html \
+                 tutorial.html
+ 
+-doclicdir := $(datadir)/doc/vstr-devel-$(VERSION)/compare_licenses/
++doclicdir := $(datadir)/doc/vstr/compare_licenses/
+ doclic_DATA = \
+                 compare_licenses/SafeStr.txt \
+                 compare_licenses/bstring.txt \
diff --git a/devel/vstr/files/patch-ltmain.sh b/devel/vstr/files/patch-ltmain.sh
index 1d5a5c7b87e1..1b8d1fd13c39 100644
--- a/devel/vstr/files/patch-ltmain.sh
+++ b/devel/vstr/files/patch-ltmain.sh
@@ -1,15 +1,6 @@
---- ltmain.sh.orig	Fri Sep 12 14:51:51 2003
-+++ ltmain.sh	Sun Sep 21 17:49:07 2003
-@@ -1280,7 +1280,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,16 @@
+--- ltmain.sh.orig	Thu Jul 21 17:41:30 2005
++++ ltmain.sh	Thu Jul 20 23:48:06 2006
+@@ -1522,8 +1522,16 @@
  	continue
  	;;
  
@@ -26,7 +17,7 @@
  	continue
  	;;
  
-@@ -3000,6 +3008,9 @@
+@@ -3245,6 +3253,9 @@
  	    # problems, so we reset it completely
  	    verstring=
  	    ;;
@@ -36,7 +27,7 @@
  	  *)
  	    verstring="0.0"
  	    ;;
-@@ -5428,10 +5439,12 @@
+@@ -5621,10 +5632,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/vstr/files/patch-tst_tst-main.c b/devel/vstr/files/patch-tst_tst-main.c
new file mode 100644
index 000000000000..3fcdb8cd842c
--- /dev/null
+++ b/devel/vstr/files/patch-tst_tst-main.c
@@ -0,0 +1,11 @@
+--- tst/tst-main.c.orig	Fri Jul 30 09:15:06 2004
++++ tst/tst-main.c	Fri Jul 21 15:45:07 2006
+@@ -133,7 +133,7 @@
+     die();
+ 
+ #ifndef USE_RESTRICTED_HEADERS
+-  if (!setlocale(LC_ALL, "en_US"))
++  if (!setlocale(LC_ALL, "en_US.ISO8859-1"))
+   {
+     fprintf(stderr,
+ " This library does things with the locale.\n"
diff --git a/devel/vstr/pkg-plist b/devel/vstr/pkg-plist
index 43a8ad637717..d0ba5e89fadd 100644
--- a/devel/vstr/pkg-plist
+++ b/devel/vstr/pkg-plist
@@ -9,36 +9,35 @@ include/vstr.h
 lib/libvstr-1.0.so
 lib/libvstr-1.0.so.13
 lib/libvstr.a
-lib/libvstr.la
 lib/libvstr.so
 libdata/pkgconfig/vstr.pc
-share/doc/vstr-devel-1.0.15/basic_cat.c.html
-share/doc/vstr-devel-1.0.15/compare_licenses/SafeStr.txt
-share/doc/vstr-devel-1.0.15/compare_licenses/bstring.txt
-share/doc/vstr-devel-1.0.15/compare_licenses/cords.txt
-share/doc/vstr-devel-1.0.15/compare_licenses/ossp-str.txt
-share/doc/vstr-devel-1.0.15/compare_licenses/rope.txt
-share/doc/vstr-devel-1.0.15/compare_licenses/sz.txt
-share/doc/vstr-devel-1.0.15/compare_licenses/toolbox.txt
-share/doc/vstr-devel-1.0.15/comparison.html
-share/doc/vstr-devel-1.0.15/constants.html
-share/doc/vstr-devel-1.0.15/constants.txt
-share/doc/vstr-devel-1.0.15/cost_tutorial.html
-share/doc/vstr-devel-1.0.15/design.html
-share/doc/vstr-devel-1.0.15/f_c.css
-share/doc/vstr-devel-1.0.15/functions.html
-share/doc/vstr-devel-1.0.15/functions.txt
-share/doc/vstr-devel-1.0.15/internal_structure.dia
-share/doc/vstr-devel-1.0.15/namespace.html
-share/doc/vstr-devel-1.0.15/overview.html
-share/doc/vstr-devel-1.0.15/printf_comparison.html
-share/doc/vstr-devel-1.0.15/req_trunc_io.html
-share/doc/vstr-devel-1.0.15/security.html
-share/doc/vstr-devel-1.0.15/security_problems.html
-share/doc/vstr-devel-1.0.15/size_cmp.gnumeric
-share/doc/vstr-devel-1.0.15/speed.html
-share/doc/vstr-devel-1.0.15/structs.html
-share/doc/vstr-devel-1.0.15/structs.txt
-share/doc/vstr-devel-1.0.15/tutorial.html
-@dirrm share/doc/vstr-devel-1.0.15/compare_licenses
-@dirrm share/doc/vstr-devel-1.0.15
+%%PORTDOCS%%%%DOCSDIR%%/basic_cat.c.html
+%%PORTDOCS%%%%DOCSDIR%%/compare_licenses/SafeStr.txt
+%%PORTDOCS%%%%DOCSDIR%%/compare_licenses/bstring.txt
+%%PORTDOCS%%%%DOCSDIR%%/compare_licenses/cords.txt
+%%PORTDOCS%%%%DOCSDIR%%/compare_licenses/ossp-str.txt
+%%PORTDOCS%%%%DOCSDIR%%/compare_licenses/rope.txt
+%%PORTDOCS%%%%DOCSDIR%%/compare_licenses/sz.txt
+%%PORTDOCS%%%%DOCSDIR%%/compare_licenses/toolbox.txt
+%%PORTDOCS%%%%DOCSDIR%%/comparison.html
+%%PORTDOCS%%%%DOCSDIR%%/constants.html
+%%PORTDOCS%%%%DOCSDIR%%/constants.txt
+%%PORTDOCS%%%%DOCSDIR%%/cost_tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/design.html
+%%PORTDOCS%%%%DOCSDIR%%/f_c.css
+%%PORTDOCS%%%%DOCSDIR%%/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/functions.txt
+%%PORTDOCS%%%%DOCSDIR%%/internal_structure.dia
+%%PORTDOCS%%%%DOCSDIR%%/namespace.html
+%%PORTDOCS%%%%DOCSDIR%%/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/printf_comparison.html
+%%PORTDOCS%%%%DOCSDIR%%/req_trunc_io.html
+%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%PORTDOCS%%%%DOCSDIR%%/security_problems.html
+%%PORTDOCS%%%%DOCSDIR%%/size_cmp.gnumeric
+%%PORTDOCS%%%%DOCSDIR%%/speed.html
+%%PORTDOCS%%%%DOCSDIR%%/structs.html
+%%PORTDOCS%%%%DOCSDIR%%/structs.txt
+%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/compare_licenses
+%%PORTDOCS%%@dirrm %%DOCSDIR%%