4 files changed, 40 insertions, 51 deletions

diff --git a/devel/gengetopt/Makefile b/devel/gengetopt/Makefile
index 3957f195a5ff..c28da2e5ec58 100644
--- a/devel/gengetopt/Makefile
+++ b/devel/gengetopt/Makefile
@@ -7,26 +7,53 @@
 #
 
 PORTNAME=	gengetopt
-PORTVERSION=	2.19.1
+PORTVERSION=	2.22.1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for generating a C function which parses command line arguments
 
-GNU_CONFIGURE=	yes
+INSTALL_WRKSRC=	${WRKSRC}/src
+
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 
 MAN1=		gengetopt.1
 INFO=		gengetopt
+PORTDOCS=	${ROOT_DOCS} ${DOC_DOCS}
+PORTEXAMPLES=	${DOC_EXAMPLES} ${TESTS_EXAMPLES}
+PLIST_FILES=	bin/gengetopt %%DATADIR%%/getopt.c %%DATADIR%%/getopt1.c \
+		%%DATADIR%%/gnugetopt.h
+PLIST_DIRS=	%%DATADIR%%
 
-.if defined(NOPORTDOCS)
-do-install:
-	@cd ${INSTALL_WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} \
-		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install
-	@cd ${INSTALL_WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} \
-		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-man
+ROOT_DOCS=	AUTHORS ChangeLog LICENSE NEWS README THANKS TODO
+DOC_DOCS=	index.html gengetopt.html
+DOC_EXAMPLES=	README.example cmdline1.c cmdline1.h cmdline2.c cmdline2.h \
+		main1.cc main2.c sample1.ggo sample2.ggo
+TESTS_EXAMPLES=	test_manual_help.c test_manual_help_cmd.c \
+		test_manual_help_cmd.ggo test_manual_help_cmd.h
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/gengetopt.1 ${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/doc/gengetopt.info ${PREFIX}/${INFO_PATH}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${ROOT_DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.for file in ${DOC_DOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
+.endfor
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+.for file in ${DOC_EXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${EXAMPLESDIR}
+.endfor
+.for file in ${TESTS_EXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/tests/${file} ${EXAMPLESDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/gengetopt/distinfo b/devel/gengetopt/distinfo
index b5205d25d1e4..d86cc893a8ae 100644
--- a/devel/gengetopt/distinfo
+++ b/devel/gengetopt/distinfo
@@ -1,3 +1,3 @@
-MD5 (gengetopt-2.19.1.tar.gz) = b78cbb10356ce67d1d22436bce59dbdf
-SHA256 (gengetopt-2.19.1.tar.gz) = 01559ea56ce8b1f84034bfed734157cd6f9e180254dfb9c813390ee1a8ab1e98
-SIZE (gengetopt-2.19.1.tar.gz) = 553841
+MD5 (gengetopt-2.22.1.tar.gz) = 3877433c69902a26887ad65c1a2d60eb
+SHA256 (gengetopt-2.22.1.tar.gz) = e8d1de4f8c102263844886a2f2b57d82c291c1eae6307ea406fb96f29a67c3a7
+SIZE (gengetopt-2.22.1.tar.gz) = 914661
diff --git a/devel/gengetopt/files/patch-aa b/devel/gengetopt/files/patch-aa
deleted file mode 100644
index 83166dabbb5b..000000000000
--- a/devel/gengetopt/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/gengetopt.texinfo.orig	Thu Dec 15 13:54:45 2005
-+++ doc/gengetopt.texinfo	Thu Dec 15 13:58:26 2005
-@@ -26,6 +26,10 @@
- @c @setchapternewpage odd
- @c %**end of header
- 
-+@direntry
-+* GenGetopt: (gengetopt).	A tool for generating a C function which parses command line arguments.
-+@end direntry
-+
- @set myhomepage @uref{http://www.lorenzobettini.it}
- 
- @ifinfo
diff --git a/devel/gengetopt/pkg-plist b/devel/gengetopt/pkg-plist
deleted file mode 100644
index 9308b45957a3..000000000000
--- a/devel/gengetopt/pkg-plist
+++ /dev/null
@@ -1,25 +0,0 @@
-@comment $FreeBSD$
-bin/gengetopt
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/examples/cmdline1.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/cmdline1.h
-%%PORTDOCS%%%%DOCSDIR%%/examples/cmdline2.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/cmdline2.h
-%%PORTDOCS%%%%DOCSDIR%%/examples/main1.cc
-%%PORTDOCS%%%%DOCSDIR%%/examples/main2.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/sample1.ggo
-%%PORTDOCS%%%%DOCSDIR%%/examples/sample2.ggo
-%%PORTDOCS%%%%DOCSDIR%%/gengetopt.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%DATADIR%%/getopt.c
-%%DATADIR%%/getopt1.c
-%%DATADIR%%/gnugetopt.h
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%