- Update to version 2.3

PR:		ports/64503
Submitted by:	Ports Fury

4 files changed, 41 insertions, 37 deletions

diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile
index dd5ff0b974a9..b8d02a5a2595 100644
--- a/devel/argtable/Makefile
+++ b/devel/argtable/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	argtable
-PORTVERSION=	2.2
-PORTREVISION=	1
+PORTVERSION=	2.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,13 +15,29 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 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
-WRKSRC=		${WRKDIR}/argtable2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+MAN3=		argtable2.3
 
-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
 
 .include <bsd.port.mk>
diff --git a/devel/argtable/distinfo b/devel/argtable/distinfo
index c6ae1339a0d0..ac0490af7b01 100644
--- a/devel/argtable/distinfo
+++ b/devel/argtable/distinfo
@@ -1,2 +1,2 @@
-MD5 (argtable-2.2.tar.gz) = 35b8948c9f4b81bb4b46dbd2b863e1b6
-SIZE (argtable-2.2.tar.gz) = 415107
+MD5 (argtable-2.3.tar.gz) = f39fbb7b9bce2257344c882323e96619
+SIZE (argtable-2.3.tar.gz) = 399746
diff --git a/devel/argtable/files/patch-Makefile.in b/devel/argtable/files/patch-Makefile.in
deleted file mode 100644
index 45137ce872bc..000000000000
--- a/devel/argtable/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Wed Dec 17 10:51:08 2003
-+++ Makefile.in	Wed Dec 17 10:51:31 2003
-@@ -34,8 +34,8 @@
- incldir     = $(prefix)/include
- libdir      = $(prefix)/lib
- mandir      = $(prefix)/man/man3
--docdir      = $(prefix)/share/doc/argtable-2.x
--exmdir      = $(prefix)/share/doc/argtable-2.x/example
-+docdir      = $(prefix)/share/doc/argtable
-+exmdir      = $(prefix)/share/examples/argtable
- 
- 
- all:
diff --git a/devel/argtable/pkg-plist b/devel/argtable/pkg-plist
index 4e701952a5a5..50ad180249dd 100644
--- a/devel/argtable/pkg-plist
+++ b/devel/argtable/pkg-plist
@@ -1,17 +1,19 @@
 include/argtable2.h
 lib/libargtable2.a
-%%DOCSDIR%%/argtable2-intro.html
-%%DOCSDIR%%/argtable2-intro.pdf
-%%DOCSDIR%%/argtable2-intro.ps
-%%DOCSDIR%%/argtable2.html
-%%DOCSDIR%%/argtable2.pdf
-%%DOCSDIR%%/argtable2.ps
-@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/Makefile
-%%EXAMPLESDIR%%/echo.c
-%%EXAMPLESDIR%%/ls.c
-%%EXAMPLESDIR%%/mv.c
-%%EXAMPLESDIR%%/myprog.c
-%%EXAMPLESDIR%%/rm.c
-%%EXAMPLESDIR%%/uname.c
-@dirrm %%EXAMPLESDIR%%
+%%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%%