upgrade to 2.5

6 files changed, 61 insertions, 41 deletions

diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile
index 5b2c17cd6587..a0c8a178f552 100644
--- a/devel/argtable/Makefile
+++ b/devel/argtable/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	argtable
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}${PORTVERSION:S/./-/g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An ANSI C library for parsing GNU style command line arguments
@@ -18,26 +19,23 @@ 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_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-MAN3=		argtable2.3
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/src/argtable2.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/src/libargtable2.a ${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/doc/argtable2.3 ${MANPREFIX}/man/man3
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in argtable2-intro.html argtable2-intro.pdf argtable2-intro.ps \
-	argtable2.html argtable2.pdf argtable2.ps
-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
-	@${MKDIR} ${EXAMPLESDIR}
-.for file in Makefile README.txt echo.c ls.c mv.c myprog.c myprog_C89.c \
-	rm.c uname.c
-	${INSTALL_DATA} ${WRKSRC}/example/${file} ${EXAMPLESDIR}
-.endfor
-.endif
+CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		docdir="${PREFIX}/share/doc/${PORTNAME}"
+WRKSRC=		${WRKDIR}/${DISTNAME}
+INSTALLS_SHLIB=	yes
+
+PORTDOCS=	*
+
+MAN3=		argtable.3
+
+post-install:
+	@${FIND} ${EXAMPLESDIR} ! -type d | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/argtable/distinfo b/devel/argtable/distinfo
index 3c442d4100b5..a297e16cd935 100644
--- a/devel/argtable/distinfo
+++ b/devel/argtable/distinfo
@@ -1,3 +1,3 @@
-MD5 (argtable-2.4.tar.gz) = 82314de9a369565deef02d76332e1d27
-SHA256 (argtable-2.4.tar.gz) = a292f91bb1213cf4a81018f40029da990b13129ffc3f17f997a119bad5e78736
-SIZE (argtable-2.4.tar.gz) = 879914
+MD5 (argtable2-5.tar.gz) = 35f8a39ab594ef3acfcbae95f834d8eb
+SHA256 (argtable2-5.tar.gz) = 38ea5e05554af30ae5657906a9a704d9cc645bae8940df903f82a67184e0c098
+SIZE (argtable2-5.tar.gz) = 3335280
diff --git a/devel/argtable/files/patch-configure b/devel/argtable/files/patch-configure
new file mode 100644
index 000000000000..daa78e7b8490
--- /dev/null
+++ b/devel/argtable/files/patch-configure
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..fc6d6503cba5
--- /dev/null
+++ b/devel/argtable/files/patch-doc::Makefile.in
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..83ae1db90b65
--- /dev/null
+++ b/devel/argtable/files/patch-ltmain.sh
@@ -0,0 +1,15 @@
+--- 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 50ad180249dd..12dd2123c218 100644
--- a/devel/argtable/pkg-plist
+++ b/devel/argtable/pkg-plist
@@ -1,19 +1,4 @@
 include/argtable2.h
 lib/libargtable2.a
-%%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%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/README.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/echo.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/ls.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%%
+lib/libargtable2.so
+lib/libargtable2.so.1