3 files changed, 96 insertions, 59 deletions

diff --git a/devel/clig/Makefile b/devel/clig/Makefile
index 45747c1f2246..069317ff2ea1 100644
--- a/devel/clig/Makefile
+++ b/devel/clig/Makefile
@@ -6,34 +6,35 @@
 #
 
 PORTNAME=	clig
-PORTVERSION=	1.1.3
-CATEGORIES=	devel tcl82
-MASTER_SITES=	http://wsd.iitb.fhg.de/~geg/clighome/
+PORTVERSION=	1.9.11.1
+CATEGORIES=	devel tcl84
+MASTER_SITES=	http://wsd.iitb.fhg.de/~geg/clighome/ \
+  		http://www.carpetsmoker.net/distfiles/ \
+		http://www.xs4all.nl/~tournoij/distfiles/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	carpetsmoker@xs4all.nl
 COMMENT=	Auto-generate an (argc, argv) processor, usage message, and manpage
 
-# This should work with any version of tcl.  See also ${MAKE_ENV}.
-BUILD_DEPENDS=	${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
-RUN_DEPENDS=	${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
-
-MAN1=		clig.1
-
 NO_BUILD=	yes
+USE_TCL_BUILD=	yes
+USE_TCL=	yes
 MAKEFILE=	makefile
-MAKE_ENV=	tclsh=${PREFIX}/bin/tclsh8.2
-PLIST_SUB=	VERSION=${DISTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-do-patch:
-	@${CHMOD} a+r ${WRKSRC}/CHANGES
-	@${MV} ${WRKSRC}/makefile ${WRKSRC}/makefile.orig
-	@${SED} -e 's#prefix =~/tools#prefix =${PREFIX}/share#' \
-	       -e 's#LROOT =~/tools#LROOT =${PREFIX}#' \
-	       -e 's#DOCDIR =$$(prefix)/doc#DOCDIR =${PREFIX}/share/doc/clig#' \
-	       -e 's#MANDIR =$$(prefix)#MANDIR =${MANPREFIX}/man/#' \
-		${WRKSRC}/makefile.orig > ${WRKSRC}/makefile
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/WISHLIST ${PREFIX}/share/doc/clig
+MAN1=		clig.1
+MANN=		clig_Commandline.n clig_Description.n clig_Double.n clig_Flag.n \
+		clig_Float.n clig_Int.n clig_Long.n clig_Name.n clig_Rest.n \
+		clig_String.n clig_Usage.n clig_Version.n clig_parseCmdline.n
+
+post-patch:
+	@${RM} ${WRKSRC}/example/.cvsignore
+	@${FIND} -d ${WRKSRC} -type d -and -name CVS -exec ${RM} -r {} \;
+	@${REINPLACE_CMD} -e 's|prefix =/usr|prefix=${PREFIX}|; \
+		s|/usr/bin/tclsh|${TCLSH}|; \
+		s|/doc/|/share/doc/|; \
+		s|-$$(VERSION)||;' \
+			${WRKSRC}/makefile
+	@${REINPLACE_CMD} -e "s|tclsh|${TCLSH}|" \
+		${WRKSRC}/man/fixman
 
 .include <bsd.port.mk>
diff --git a/devel/clig/distinfo b/devel/clig/distinfo
index 1277fb7e8412..f7dbb2fd508f 100644
--- a/devel/clig/distinfo
+++ b/devel/clig/distinfo
@@ -1,3 +1,3 @@
-MD5 (clig-1.1.3.tar.gz) = d840ebc632be0f39a55fc35378f9eccc
-SHA256 (clig-1.1.3.tar.gz) = 675ce5020d24d0ce4b57941b0795064af4a5c7da7b97eabca1f2dd8ae26cda4f
-SIZE (clig-1.1.3.tar.gz) = 36085
+MD5 (clig-1.9.11.1.tar.gz) = 01eb0b8d3b87c4cc10f2dab56d8cdab4
+SHA256 (clig-1.9.11.1.tar.gz) = 84cc73023a0c24072f6c8a044f159f80af659116647fc79b0b5461d9a81b20ec
+SIZE (clig-1.9.11.1.tar.gz) = 68036
diff --git a/devel/clig/pkg-plist b/devel/clig/pkg-plist
index c9e6e674dcb3..b6969517eb53 100644
--- a/devel/clig/pkg-plist
+++ b/devel/clig/pkg-plist
@@ -1,37 +1,73 @@
 bin/clig
-share/%%VERSION%%/bin/clig
-share/%%VERSION%%/tcl/genCheckMandatory.tcl
-share/%%VERSION%%/tcl/genStruct.tcl
-share/%%VERSION%%/tcl/genShowOptionValues.tcl
-share/%%VERSION%%/tcl/genParse.tcl
-share/%%VERSION%%/tcl/genMan.tcl
-share/%%VERSION%%/tcl/genDotH.tcl
-share/%%VERSION%%/tcl/genDotC.tcl
-share/%%VERSION%%/tcl/genDefault.tcl
-share/%%VERSION%%/tcl/genUsage.tcl
-share/%%VERSION%%/tcl/genGUI.tcl
-share/%%VERSION%%/tcl/globalpg.tcl
-share/%%VERSION%%/tcl/ober.tcl
-share/%%VERSION%%/c/catArgv.c
-share/%%VERSION%%/c/missingErr.c
-share/%%VERSION%%/c/getStringOpts.c
-share/%%VERSION%%/c/getStringOpt.c
-share/%%VERSION%%/c/getIntOpts.c
-share/%%VERSION%%/c/getIntOpt.c
-share/%%VERSION%%/c/getFloatOpts.c
-share/%%VERSION%%/c/getFloatOpt.c
-share/%%VERSION%%/c/checkIntLower.c
-share/%%VERSION%%/c/checkIntHigher.c
-share/%%VERSION%%/c/checkFloatLower.c
-share/%%VERSION%%/c/checkFloatHigher.c
-share/%%VERSION%%/c/template.man
-share/doc/clig/makefile
-share/doc/clig/cmdline.cli
-share/doc/clig/main.c
+bin/cligUsage
+lib/clig/c/catArgv.c
+lib/clig/c/checkDoubleHigher.c
+lib/clig/c/checkDoubleLower.c
+lib/clig/c/checkFloatConversion.c
+lib/clig/c/checkFloatHigher.c
+lib/clig/c/checkFloatLower.c
+lib/clig/c/checkIntHigher.c
+lib/clig/c/checkIntLower.c
+lib/clig/c/checkLongHigher.c
+lib/clig/c/checkLongLower.c
+lib/clig/c/getDoubleOpt.c
+lib/clig/c/getDoubleOpts.c
+lib/clig/c/getFloatOpt.c
+lib/clig/c/getFloatOpts.c
+lib/clig/c/getIntOpt.c
+lib/clig/c/getIntOpts.c
+lib/clig/c/getLongOpt.c
+lib/clig/c/getLongOpts.c
+lib/clig/c/getStringOpt.c
+lib/clig/c/getStringOpts.c
+lib/clig/c/missingErr.c
+lib/clig/c/template.man
+lib/clig/pkgIndex.tcl
+lib/clig/tcl/cmdline.cli
+lib/clig/tcl/genCheckMandatory.tcl
+lib/clig/tcl/genDefault.tcl
+lib/clig/tcl/genDotC.tcl
+lib/clig/tcl/genDotH.tcl
+lib/clig/tcl/genGUI.tcl
+lib/clig/tcl/genMan.tcl
+lib/clig/tcl/genParse.tcl
+lib/clig/tcl/genShowOptionValues.tcl
+lib/clig/tcl/genStruct.tcl
+lib/clig/tcl/genUsage.tcl
+lib/clig/tcl/globalpg.tcl
+lib/clig/tcl/ober.tcl
+lib/clig/tcl/util.tcl
+lib/clig/tcllib/DeclCommandline.tcl
+lib/clig/tcllib/DeclDescription.tcl
+lib/clig/tcllib/DeclDouble.tcl
+lib/clig/tcllib/DeclFlag.tcl
+lib/clig/tcllib/DeclFloat.tcl
+lib/clig/tcllib/DeclInt.tcl
+lib/clig/tcllib/DeclLong.tcl
+lib/clig/tcllib/DeclName.tcl
+lib/clig/tcllib/DeclRest.tcl
+lib/clig/tcllib/DeclString.tcl
+lib/clig/tcllib/DeclUsage.tcl
+lib/clig/tcllib/DeclVersion.tcl
+lib/clig/tcllib/declOpt.tcl
+lib/clig/tcllib/oldOpts.tcl
+lib/clig/tcllib/parse.tcl
+lib/clig/tcllib/setSpec.tcl
+lib/clig/tcllib/usage.tcl
+lib/clig/tcllib/version.tcl
+share/doc/clig/ANNOUNCE
 share/doc/clig/CHANGES
+share/doc/clig/COPYING-2.0
+share/doc/clig/LICENSE
+share/doc/clig/README
 share/doc/clig/WISHLIST
-@dirrm share/%%VERSION%%/bin
+share/doc/clig/example/cmdline.cli
+share/doc/clig/example/main.c
+share/doc/clig/example/makefile
+share/doc/clig/index.html
+@dirrm lib/clig/c
+@dirrm lib/clig/tcl
+@dirrm lib/clig/tcllib
+@dirrm lib/clig
+@dirrm share/doc/clig/example
 @dirrm share/doc/clig
-@dirrm share/%%VERSION%%/c
-@dirrm share/%%VERSION%%/tcl
-@dirrm share/%%VERSION%%