5 files changed, 48 insertions, 52 deletions

diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile
index a0c8a178f552..a62b9d3392f1 100644
--- a/devel/argtable/Makefile
+++ b/devel/argtable/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	argtable
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,26 +17,31 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/./-/g}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An ANSI C library for parsing GNU style command line arguments
 
-WRKSRC=		${WRKDIR}/${PORTNAME}2
-
-USE_GETOPT_LONG=	yes
-USE_GETTEXT=	yes
 USE_GNOME=	gnometarget
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		docdir="${PREFIX}/share/doc/${PORTNAME}"
-WRKSRC=		${WRKDIR}/${DISTNAME}
+USE_GETOPT_LONG=	yes
+USE_REINPLACE=	yes
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
-PORTDOCS=	*
+MAN3=		argtable2.3
+MLINKS=		argtable2.3 argtable.3
 
-MAN3=		argtable.3
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g ; \
+		 s|: install-dist_exampleDATA|:|g' ${WRKSRC}/Makefile.in
 
 post-install:
-	@${FIND} ${EXAMPLESDIR} ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	${INSTALL_MAN} ${WRKSRC}/doc/argtable2.3 ${MAN3PREFIX}/man/man3
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.gif ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${DOCSDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/example/*.c ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/example/*.h ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/example/*.txt ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/argtable/files/patch-configure b/devel/argtable/files/patch-configure
deleted file mode 100644
index daa78e7b8490..000000000000
--- a/devel/argtable/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Dec 26 09:23:07 2005
-+++ configure	Mon Dec 26 09:23:35 2005
-@@ -20767,7 +20767,7 @@
- then
-     docdir='${prefix}/share/doc/argtable2'
- fi
--exampledir='${docdir}/example'
-+exampledir='${prefix}/share/examples/argtable'
- 
- 
-                                                                                 ac_config_files="$ac_config_files Makefile argtable.spec example/Makefile src/Makefile doc/Makefile doc/argtable2.3 doc/argtable2.html tests/Makefile"
diff --git a/devel/argtable/files/patch-doc::Makefile.in b/devel/argtable/files/patch-doc::Makefile.in
deleted file mode 100644
index fc6d6503cba5..000000000000
--- a/devel/argtable/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Mon Dec 26 09:30:50 2005
-+++ doc/Makefile.in	Mon Dec 26 09:31:03 2005
-@@ -173,7 +173,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--dist_man_MANS = argtable2.3 argtable.3
-+dist_man_MANS = argtable.3
- dist_doc_DATA = argtable2-advanced.html argtable2-advanced.pdf \
- 	argtable2-advanced.ps argtable2-intro.html argtable2-intro.pdf \
- 	argtable2-intro.ps argtable2.html argtable2.pdf argtable2.ps \
diff --git a/devel/argtable/files/patch-ltmain.sh b/devel/argtable/files/patch-ltmain.sh
deleted file mode 100644
index 83ae1db90b65..000000000000
--- a/devel/argtable/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Mon Dec 26 09:27:12 2005
-+++ ltmain.sh	Mon Dec 26 09:27:43 2005
-@@ -5551,10 +5551,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/argtable/pkg-plist b/devel/argtable/pkg-plist
index 12dd2123c218..9c183ce064bd 100644
--- a/devel/argtable/pkg-plist
+++ b/devel/argtable/pkg-plist
@@ -2,3 +2,30 @@ include/argtable2.h
 lib/libargtable2.a
 lib/libargtable2.so
 lib/libargtable2.so.1
+%%PORTDOCS%%%%DOCSDIR%%/arg_int.gif
+%%PORTDOCS%%%%DOCSDIR%%/argtable2-advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/argtable2-advanced.pdf
+%%PORTDOCS%%%%DOCSDIR%%/argtable2-advanced.ps
+%%PORTDOCS%%%%DOCSDIR%%/argtable2-intro.html
+%%PORTDOCS%%%%DOCSDIR%%/argtable2-intro.pdf
+%%PORTDOCS%%%%DOCSDIR%%/argtable2-intro.ps
+%%PORTDOCS%%%%DOCSDIR%%/argtable2.html
+%%PORTDOCS%%%%DOCSDIR%%/argtable2.pdf
+%%PORTDOCS%%%%DOCSDIR%%/argtable2.ps
+%%PORTDOCS%%%%DOCSDIR%%/argxxx.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/README.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/argcustom.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/argxxx.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/argxxx.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/callbacks.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/echo.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/hasoptvalue.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/ls.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/multisyntax.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/mv.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/myprog.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/myprog_C89.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/rm.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/uname.c
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%