Attachment #153014 for bug #196450

Lines 2-31 Link Here

(-)clig/Makefile (-8 / +39 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= clig	4	PORTNAME= clig
5	PORTVERSION= 1.9.11.1	5	PORTVERSION= 1.9.11.2
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= devel tcl	7	CATEGORIES= devel tcl
8	MASTER_SITES= http://wsd.iitb.fhg.de/~geg/clighome/	8	MASTER_SITES= http://BSDforge.com/projects/source/devel/clig/
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= portmaster@BSDforge.com
11	COMMENT= Auto-generate an (argc, argv) processor, usage message, and manpage	11	COMMENT= Auto-generate an (argc, argv) processor, usage message, and manpage
12		12
		13	LICENSE= GPLv2
		14
13	OPTIONS_DEFINE= DOCS	15	OPTIONS_DEFINE= DOCS
		16	DOCS_DESC= Install documentation
		17	OPTIONS_DEFAULT=DOCS
14		18
15	NO_BUILD= yes	19	NO_BUILD= yes
16	USES+= tcl	20	USES+= tar:xz tcl
17	MAKEFILE= makefile	21	MAKEFILE= makefile
18	MAKE_ENV+= NOPORTDOCS=${NOPORTDOCS}
19	WRKSRC= ${WRKDIR}/${PORTNAME}	22	WRKSRC= ${WRKDIR}/${PORTNAME}
20	PORTDOCS= *	23	PORTDOCS= CHANGES ANNOUNCE index.html README WISHLIST COPYING-2.0 LICENSE
		24	CLIGBIN= ${WRKSRC}/clig ${WRKSRC}/cligUsage
		25	CLIGMANN= clig_Commandline.n clig_Description.n clig_Double.n clig_Flag.n \
		26	clig_Float.n clig_Int.n clig_Long.n clig_Name.n clig_Rest.n \
		27	clig_String.n clig_Usage.n clig_Version.n clig_parseCmdline.n
		28	CLIGC= ${WRKSRC}/c/
21		29
22	.include <bsd.port.options.mk>	30	.include <bsd.port.options.mk>
23		31
		32	post-extract:
		33	${CP} ${FILESDIR}/installer ${WRKSRC}/installer
		34
24	post-patch:	35	post-patch:
25	@${RM} ${WRKSRC}/example/.cvsignore	36	@${RM} ${WRKSRC}/example/.cvsignore
26	@${FIND} -d ${WRKSRC} -type d -and -name CVS -exec ${RM} -r {} \;	37	@${FIND} -d ${WRKSRC} -type d -and -name CVS -exec ${RM} -r {} \;
27	@${REINPLACE_CMD} -e 's\|prefix =/usr\|prefix=${STAGEDIR}${PREFIX}\|; \	38	@${REINPLACE_CMD} -e 's\|/usr/bin/tclsh\|/usr/local/bin/tclsh\|; \
28	s\|/usr/bin/tclsh\|${TCLSH}\|; \
29	s\|/doc/\|/share/doc/\|; \	39	s\|/doc/\|/share/doc/\|; \
30	s\|-$$(VERSION)\|\|;' \	40	s\|-$$(VERSION)\|\|;' \
31	${WRKSRC}/makefile	41	${WRKSRC}/makefile
Lines 32-35 Link Here
32	@${REINPLACE_CMD} -e "s\|tclsh\|${TCLSH}\|" \	42	@${REINPLACE_CMD} -e "s\|tclsh\|${TCLSH}\|" \
33	${WRKSRC}/man/fixman	43	${WRKSRC}/man/fixman
34		44
		45	post-install:
		46	${INSTALL_SCRIPT} ${CLIGBIN} ${STAGEDIR}${PREFIX}/bin/
		47	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
		48	${INSTALL_DATA} ${WRKSRC}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
		49	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/c/
		50	${INSTALL_DATA} ${CLIGC}* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/c/
		51	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/tcl/
		52	${INSTALL_DATA} ${WRKSRC}/tcl/* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/tcl/
		53	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/tcllib/
		54	${INSTALL_DATA} ${WRKSRC}/tcllib/* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/tcllib/
		55	${INSTALL_MAN} ${WRKSRC}/man/clig.1 ${STAGEDIR}${MANPREFIX}/man/man1
		56	.for FILE in ${CLIGMANN}
		57	${INSTALL_MAN} ${WRKSRC}/man/${FILE} ${STAGEDIR}${MANPREFIX}/man/mann/${FILE}
		58	.endfor
		59	@${MKDIR} ${STAGEDIR}${DOCSDIR}
		60	.if ${PORT_OPTIONS:MDOCS}
		61	.for FILE in ${PORTDOCS}
		62	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE}
		63	.endfor
		64	.endif
		65
35	.include <bsd.port.mk>	66	.include <bsd.port.mk>




rm	./tcl/clig
mv	./clig.fixed ./clig
mv	./cligUsage.fixed ./cligUsage
mv	./man/clig.mfixed ./man/clig.1
mv	./man/clig_Commandline.mfixed ./man/clig_Commandline.n
mv	./man/clig_Description.mfixed ./man/clig_Description.n
mv	./man/clig_Double.mfixed ./man/clig_Double.n
mv	./man/clig_Flag.mfixed ./man/clig_Flag.n
mv	./man/clig_Float.mfixed ./man/clig_Float.n
mv	./man/clig_Int.mfixed ./man/clig_Int.n
mv	./man/clig_Long.mfixed ./man/clig_Long.n
mv	./man/clig_Name.mfixed ./man/clig_Name.n
mv	./man/clig_Rest.mfixed ./man/clig_Rest.n
mv	./man/clig_String.mfixed ./man/clig_String.n
mv	./man/clig_Usage.mfixed ./man/clig_Usage.n
mv	./man/clig_Version.mfixed ./man/clig_Version.n
mv	./man/clig_parseCmdline.mfixed ./man/clig_parseCmdline.n
exit

Lines 4-10 Link Here

(-)clig/files/patch-install (-1 / +1 lines)
4	}	4	}
5		5
6	# doc and examples	6	# doc and examples
7	+if {$env(NOPORTDOCS) eq {}} {	7	+if {$env(PORT_OPTIONS:MDOCS) eq {}} {
8	file copy -force CHANGES ANNOUNCE index.html README WISHLIST \	8	file copy -force CHANGES ANNOUNCE index.html README WISHLIST \
9	COPYING-2.0 LICENSE example \	9	COPYING-2.0 LICENSE example \
10	$env(DOCDIR)	10	$env(DOCDIR)




--- makefile.orig	2015-02-15 11:32:16.000000000 -0800
+++ makefile	2015-02-15 11:33:37.000000000 -0800
@@ -11,7 +11,7 @@
 # package like an rpm.
 build_root =
 
-prefix =/usr
+prefix =/usr/local
 exec_prefix =$(prefix)
 
 # Name of subdirectory to be used beyond DOCDIR and LIBDIR
@@ -98,11 +98,5 @@
 	rm -f pkgIndex.tcl *.fixed $(M1FILES.f) $(MnFILES.f)
 
 install: all
-	$(TCLSH) ./install \
-	   BINDIR=$(build_root)$(BINDIR) \
-	   LIBDIR=$(build_root)$(LIBDIR) \
-           MAN1DIR=$(build_root)$(MAN1DIR) M1FILES="$(M1FILES.f)" \
-           M1SUFFIX=$(M1SUFFIX) \
-	   MANnDIR=$(build_root)$(MANnDIR) MnFILES="$(MnFILES.f)" \
-	   MnSUFFIX=$(MnSUFFIX) \
-	   DOCDIR=$(build_root)$(DOCDIR) VERSION=$(VERSION)
+	chmod 0755 ./installer &&\
+	${SH} ./installer

Lines 1-10 Link Here

(-)clig/pkg-descr (-7 / +7 lines)
1	Clig generates C code to take apart the typical command-line arguments	1	Clig generates C code to take apart the typical command-line arguments given
2	given to a C program. Input to clig is a simple description file that	2	to a C program. Input to clig is a simple description file that specifies the
3	specifies the name and number of options, their type (Flag, String,	3	name and number of options, their type (Flag, String, Float, Int) and
4	Float, Int) and permissible range, and which options are mandatory. From	4	permissible range, and which options are mandatory. From this, clig will
5	this, clig will generate self-contained C code to include in your program,	5	generate self-contained C code to include in your program, a usage message,
6	a usage message, and a manual page skeleton.	6	and a manual page skeleton.
7		7
8	Clig does a lot more than getopt!	8	Clig does a lot more than getopt!
9		9
10	WWW: http://wsd.iitb.fhg.de/~geg/clighome/	10	WWW: http://BSDforge.com/projects/devel/clig/




@mode 0555
bin/clig
bin/cligUsage
@mode 0644
lib/clig/c/catArgv.c
lib/clig/c/checkDoubleHigher.c
lib/clig/c/checkDoubleLower.c

lib/clig/tcl/genShowOptionValues.tcl
lib/clig/tcl/genStruct.tcl
lib/clig/tcl/genUsage.tcl
@mode 0555
lib/clig/tcl/globalpg.tcl
lib/clig/tcl/ober.tcl
@mode 0644
lib/clig/tcl/util.tcl
lib/clig/tcllib/DeclCommandline.tcl
lib/clig/tcllib/DeclDescription.tcl

lib/clig/tcllib/setSpec.tcl
lib/clig/tcllib/usage.tcl
lib/clig/tcllib/version.tcl
@mode 0444
man/man1/clig.1.gz
man/mann/clig_Commandline.n.gz
man/mann/clig_Description.n.gz

Return to bug 196450

Line 0 Link Here

(-)clig/files/installer (+18 lines)
	1	rm ./tcl/clig
	2	mv ./clig.fixed ./clig
	3	mv ./cligUsage.fixed ./cligUsage
	4	mv ./man/clig.mfixed ./man/clig.1
	5	mv ./man/clig_Commandline.mfixed ./man/clig_Commandline.n
	6	mv ./man/clig_Description.mfixed ./man/clig_Description.n
	7	mv ./man/clig_Double.mfixed ./man/clig_Double.n
	8	mv ./man/clig_Flag.mfixed ./man/clig_Flag.n
	9	mv ./man/clig_Float.mfixed ./man/clig_Float.n
	10	mv ./man/clig_Int.mfixed ./man/clig_Int.n
	11	mv ./man/clig_Long.mfixed ./man/clig_Long.n
	12	mv ./man/clig_Name.mfixed ./man/clig_Name.n
	13	mv ./man/clig_Rest.mfixed ./man/clig_Rest.n
	14	mv ./man/clig_String.mfixed ./man/clig_String.n
	15	mv ./man/clig_Usage.mfixed ./man/clig_Usage.n
	16	mv ./man/clig_Version.mfixed ./man/clig_Version.n
	17	mv ./man/clig_parseCmdline.mfixed ./man/clig_parseCmdline.n
	18	exit

Lines 1-9 Link Here

(-)clig/files/patch-makefile (-8 / +24 lines)
1	--- makefile.orig 2013-09-26 15:22:07.000000000 +0200	1	--- makefile.orig 2015-02-15 11:32:16.000000000 -0800
2	+++ makefile 2013-09-26 15:22:46.000000000 +0200	2	+++ makefile 2015-02-15 11:33:37.000000000 -0800
3	@@ -104,4 +104,5 @@	3	@@ -11,7 +11,7 @@
4	M1SUFFIX=$(M1SUFFIX) \	4	# package like an rpm.
5	MANnDIR=$(build_root)$(MANnDIR) MnFILES="$(MnFILES.f)" \	5	build_root =
6	MnSUFFIX=$(MnSUFFIX) \	6
		7	-prefix =/usr
		8	+prefix =/usr/local
		9	exec_prefix =$(prefix)
		10
		11	# Name of subdirectory to be used beyond DOCDIR and LIBDIR
		12	@@ -98,11 +98,5 @@
		13	rm -f pkgIndex.tcl *.fixed $(M1FILES.f) $(MnFILES.f)
		14
		15	install: all
		16	- $(TCLSH) ./install \
		17	- BINDIR=$(build_root)$(BINDIR) \
		18	- LIBDIR=$(build_root)$(LIBDIR) \
		19	- MAN1DIR=$(build_root)$(MAN1DIR) M1FILES="$(M1FILES.f)" \
		20	- M1SUFFIX=$(M1SUFFIX) \
		21	- MANnDIR=$(build_root)$(MANnDIR) MnFILES="$(MnFILES.f)" \
		22	- MnSUFFIX=$(MnSUFFIX) \
7	- DOCDIR=$(build_root)$(DOCDIR) VERSION=$(VERSION)	23	- DOCDIR=$(build_root)$(DOCDIR) VERSION=$(VERSION)
8	+ DOCDIR=$(build_root)$(DOCDIR) VERSION=$(VERSION) \	24	+ chmod 0755 ./installer &&\
9	+ NOPORTDOCS=${NOPORTDOCS}	25	+ ${SH} ./installer

Lines 1-5 Link Here

(-)clig/pkg-plist (+5 lines)
		1	@mode 0555
1	bin/clig	2	bin/clig
2	bin/cligUsage	3	bin/cligUsage
		4	@mode 0644
3	lib/clig/c/catArgv.c	5	lib/clig/c/catArgv.c
4	lib/clig/c/checkDoubleHigher.c	6	lib/clig/c/checkDoubleHigher.c
5	lib/clig/c/checkDoubleLower.c	7	lib/clig/c/checkDoubleLower.c
Lines 34-41 Link Here
34	lib/clig/tcl/genShowOptionValues.tcl	36	lib/clig/tcl/genShowOptionValues.tcl
35	lib/clig/tcl/genStruct.tcl	37	lib/clig/tcl/genStruct.tcl
36	lib/clig/tcl/genUsage.tcl	38	lib/clig/tcl/genUsage.tcl
		39	@mode 0555
37	lib/clig/tcl/globalpg.tcl	40	lib/clig/tcl/globalpg.tcl
38	lib/clig/tcl/ober.tcl	41	lib/clig/tcl/ober.tcl
		42	@mode 0644
39	lib/clig/tcl/util.tcl	43	lib/clig/tcl/util.tcl
40	lib/clig/tcllib/DeclCommandline.tcl	44	lib/clig/tcllib/DeclCommandline.tcl
41	lib/clig/tcllib/DeclDescription.tcl	45	lib/clig/tcllib/DeclDescription.tcl
Lines 55-60 Link Here
55	lib/clig/tcllib/setSpec.tcl	59	lib/clig/tcllib/setSpec.tcl
56	lib/clig/tcllib/usage.tcl	60	lib/clig/tcllib/usage.tcl
57	lib/clig/tcllib/version.tcl	61	lib/clig/tcllib/version.tcl
		62	@mode 0444
58	man/man1/clig.1.gz	63	man/man1/clig.1.gz
59	man/mann/clig_Commandline.n.gz	64	man/mann/clig_Commandline.n.gz
60	man/mann/clig_Description.n.gz	65	man/mann/clig_Description.n.gz