View | Details | Raw Unified | Return to bug 196450 | Differences between
and this patch

Collapse All | Expand All

(-)clig/Makefile (-8 / +41 lines)
Lines 2-31 Link Here
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
15
RUN_DEPENDS=	tclsh:${PORTSDIR}/lang/tcl-wrapper
16
13
OPTIONS_DEFINE=	DOCS
17
OPTIONS_DEFINE=	DOCS
18
DOCS_DESC=		Install documentation
19
OPTIONS_DEFAULT=DOCS
14
20
15
NO_BUILD=	yes
21
NO_BUILD=	yes
16
USES+=		tcl
22
USES+=		tar:xz tcl
17
MAKEFILE=	makefile
23
MAKEFILE=	makefile
18
MAKE_ENV+=	NOPORTDOCS=${NOPORTDOCS}
19
WRKSRC=		${WRKDIR}/${PORTNAME}
24
WRKSRC=		${WRKDIR}/${PORTNAME}
20
PORTDOCS=	*
25
PORTDOCS=	CHANGES ANNOUNCE index.html README WISHLIST COPYING-2.0 LICENSE
26
CLIGBIN=	${WRKSRC}/clig ${WRKSRC}/cligUsage
27
CLIGMANN=	clig_Commandline.n clig_Description.n clig_Double.n clig_Flag.n \
28
		clig_Float.n clig_Int.n clig_Long.n clig_Name.n clig_Rest.n \
29
		clig_String.n clig_Usage.n clig_Version.n clig_parseCmdline.n
30
CLIGC=		${WRKSRC}/c/
21
31
22
.include <bsd.port.options.mk>
32
.include <bsd.port.options.mk>
23
33
34
post-extract:
35
	${CP} ${FILESDIR}/installer ${WRKSRC}/installer
36
24
post-patch:
37
post-patch:
25
	@${RM} ${WRKSRC}/example/.cvsignore
38
	@${RM} ${WRKSRC}/example/.cvsignore
26
	@${FIND} -d ${WRKSRC} -type d -and -name CVS -exec ${RM} -r {} \;
39
	@${FIND} -d ${WRKSRC} -type d -and -name CVS -exec ${RM} -r {} \;
27
	@${REINPLACE_CMD} -e 's|prefix =/usr|prefix=${STAGEDIR}${PREFIX}|; \
40
	@${REINPLACE_CMD} -e 's|/usr/bin/tclsh|/usr/local/bin/tclsh|; \
28
		s|/usr/bin/tclsh|${TCLSH}|; \
29
		s|/doc/|/share/doc/|; \
41
		s|/doc/|/share/doc/|; \
30
		s|-$$(VERSION)||;' \
42
		s|-$$(VERSION)||;' \
31
			${WRKSRC}/makefile
43
			${WRKSRC}/makefile
Lines 32-35 Link Here
32
	@${REINPLACE_CMD} -e "s|tclsh|${TCLSH}|" \
44
	@${REINPLACE_CMD} -e "s|tclsh|${TCLSH}|" \
33
		${WRKSRC}/man/fixman
45
		${WRKSRC}/man/fixman
34
46
47
post-install:
48
	${INSTALL_SCRIPT} ${CLIGBIN} ${STAGEDIR}${PREFIX}/bin/
49
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
50
		${INSTALL_DATA} ${WRKSRC}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
51
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/c/
52
		${INSTALL_DATA} ${CLIGC}* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/c/
53
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/tcl/
54
		${INSTALL_DATA} ${WRKSRC}/tcl/* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/tcl/
55
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/tcllib/
56
		${INSTALL_DATA} ${WRKSRC}/tcllib/* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/tcllib/
57
	${INSTALL_MAN} ${WRKSRC}/man/clig.1 ${STAGEDIR}${MANPREFIX}/man/man1
58
.for FILE in ${CLIGMANN}
59
	${INSTALL_MAN} ${WRKSRC}/man/${FILE} ${STAGEDIR}${MANPREFIX}/man/mann/${FILE}
60
.endfor
61
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
62
.if ${PORT_OPTIONS:MDOCS}
63
.for FILE in ${PORTDOCS}
64
	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE}
65
.endfor
66
.endif
67
35
.include <bsd.port.mk>
68
.include <bsd.port.mk>
(-)clig/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (clig-1.9.11.1.tar.gz) = 84cc73023a0c24072f6c8a044f159f80af659116647fc79b0b5461d9a81b20ec
1
SHA256 (clig-1.9.11.2.tar.xz) = 2cf68dc6fd27ea12326e7e80bc66d398dd83888008aa90c2d5b87a2c0b328db8
2
SIZE (clig-1.9.11.1.tar.gz) = 68036
2
SIZE (clig-1.9.11.2.tar.xz) = 57588
(-)clig/files/installer (+18 lines)
Line 0 Link Here
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
(-)clig/files/patch-install (-1 / +1 lines)
Lines 4-10 Link Here
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)
(-)clig/files/patch-makefile (-8 / +24 lines)
Lines 1-9 Link Here
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
(-)clig/pkg-descr (-7 / +7 lines)
Lines 1-10 Link Here
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/
(-)clig/pkg-plist (+5 lines)
Lines 1-5 Link Here
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

Return to bug 196450