Thu Sep 11 21:48:34 2014 UTC ()
libgetopt-1.4.6: Don't replace getopt on SunOS.


(jperkin)
diff -r1.35 -r1.36 pkgsrc/devel/libgetopt/Makefile
diff -r1.14 -r1.15 pkgsrc/devel/libgetopt/buildlink3.mk
diff -r1.8 -r1.9 pkgsrc/devel/libgetopt/files/getopt.h
cvs diff -r1.35 -r1.36 pkgsrc/devel/libgetopt/Makefile (switch to unified diff)

--- pkgsrc/devel/libgetopt/Makefile 2014/01/01 02:48:31 1.35
+++ pkgsrc/devel/libgetopt/Makefile 2014/09/11 21:48:34 1.36
@@ -1,43 +1,43 @@ @@ -1,43 +1,43 @@
1# $NetBSD: Makefile,v 1.35 2014/01/01 02:48:31 ryoon Exp $ 1# $NetBSD: Makefile,v 1.36 2014/09/11 21:48:34 jperkin Exp $
2# 2#
3 3
4DISTNAME= libgetopt-1.4.5 4DISTNAME= libgetopt-1.4.6
5CATEGORIES= pkgtools sysutils 5CATEGORIES= pkgtools sysutils
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= Library for handling --long options 10COMMENT= Library for handling --long options
11 11
12CONFLICTS= man-pages-[0-9]* 12CONFLICTS= man-pages-[0-9]*
13 13
14USE_LIBTOOL= YES 14USE_LIBTOOL= YES
15WRKSRC= ${WRKDIR}/libgetopt 15WRKSRC= ${WRKDIR}/libgetopt
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18 18
19.if ${OPSYS} == "SunOS" || ${OPSYS} == "AIX" || ${OPSYS} == "HPUX" || \ 19.if ${OPSYS} == "AIX" || ${OPSYS} == "HPUX" || \
20 ${OPSYS} == "OSF1" || ${OPSYS} == "Linux" 20 ${OPSYS} == "OSF1" || ${OPSYS} == "Linux"
21CFLAGS+= -DREPLACE_GETOPT 21CFLAGS+= -DREPLACE_GETOPT
22.endif 22.endif
23CFLAGS.OSF1+= -I. # stdio.h includes <getopt.h>, make sure it's our copy 23CFLAGS.OSF1+= -I. # stdio.h includes <getopt.h>, make sure it's our copy
24 24
25INSTALLATION_DIRS= include lib ${PKGMANDIR}/man3 25INSTALLATION_DIRS= include lib ${PKGMANDIR}/man3
26 26
27do-extract: 27do-extract:
28 ${MKDIR} ${WRKSRC} 28 ${MKDIR} ${WRKSRC}
29 ${CP} ${FILESDIR}/getopt_long.? ${WRKSRC} 29 ${CP} ${FILESDIR}/getopt_long.? ${WRKSRC}
30 ${CP} ${FILESDIR}/getopt.h ${WRKSRC} 30 ${CP} ${FILESDIR}/getopt.h ${WRKSRC}
31 31
32do-build: 32do-build:
33 cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.c} getopt_long.c 33 cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.c} getopt_long.c
34 cd ${WRKSRC} && ${LIBTOOL} --mode=link ${LINK.c} -o libgetopt.la getopt_long.lo -version-info 5:1:4 -rpath ${PREFIX}/lib 34 cd ${WRKSRC} && ${LIBTOOL} --mode=link ${LINK.c} -o libgetopt.la getopt_long.lo -version-info 5:1:4 -rpath ${PREFIX}/lib
35 35
36do-install: 36do-install:
37 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libgetopt.la \ 37 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libgetopt.la \
38 ${DESTDIR}${PREFIX}/lib/ 38 ${DESTDIR}${PREFIX}/lib/
39 ${INSTALL_DATA} ${WRKSRC}/getopt.h ${DESTDIR}${PREFIX}/include/ 39 ${INSTALL_DATA} ${WRKSRC}/getopt.h ${DESTDIR}${PREFIX}/include/
40 ${INSTALL_MAN} ${WRKSRC}/getopt_long.3 \ 40 ${INSTALL_MAN} ${WRKSRC}/getopt_long.3 \
41 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/ 41 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/
42 42
43.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/devel/libgetopt/buildlink3.mk (switch to unified diff)

--- pkgsrc/devel/libgetopt/buildlink3.mk 2014/01/01 02:48:31 1.14
+++ pkgsrc/devel/libgetopt/buildlink3.mk 2014/09/11 21:48:34 1.15
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: buildlink3.mk,v 1.14 2014/01/01 02:48:31 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.15 2014/09/11 21:48:34 jperkin Exp $
2 2
3BUILDLINK_TREE+= getopt 3BUILDLINK_TREE+= getopt
4 4
5.if !defined(LIBGETOPT_BUILDLINK3_MK) 5.if !defined(LIBGETOPT_BUILDLINK3_MK)
6LIBGETOPT_BUILDLINK3_MK:= 6LIBGETOPT_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.getopt+= libgetopt>=1.4.5 8BUILDLINK_API_DEPENDS.getopt+= libgetopt>=1.4.6
9BUILDLINK_PKGSRCDIR.getopt?= ../../devel/libgetopt 9BUILDLINK_PKGSRCDIR.getopt?= ../../devel/libgetopt
10.endif # LIBGETOPT_BUILDLINK3_MK 10.endif # LIBGETOPT_BUILDLINK3_MK
11 11
12BUILDLINK_TREE+= -getopt 12BUILDLINK_TREE+= -getopt
cvs diff -r1.8 -r1.9 pkgsrc/devel/libgetopt/files/getopt.h (switch to unified diff)

--- pkgsrc/devel/libgetopt/files/getopt.h 2014/01/01 02:48:31 1.8
+++ pkgsrc/devel/libgetopt/files/getopt.h 2014/09/11 21:48:34 1.9
@@ -1,78 +1,78 @@ @@ -1,78 +1,78 @@
1/* $NetBSD: getopt.h,v 1.8 2014/01/01 02:48:31 ryoon Exp $ */ 1/* $NetBSD: getopt.h,v 1.9 2014/09/11 21:48:34 jperkin Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2000 The NetBSD Foundation, Inc. 4 * Copyright (c) 2000 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Dieter Baron and Thomas Klausner. 8 * by Dieter Baron and Thomas Klausner.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in the 16 * notice, this list of conditions and the following disclaimer in the
17 * documentation and/or other materials provided with the distribution. 17 * documentation and/or other materials provided with the distribution.
18 * 18 *
19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS 19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#ifndef _GETOPT_H_ 32#ifndef _GETOPT_H_
33#define _GETOPT_H_ 33#define _GETOPT_H_
34 34
35#include <unistd.h> 35#include <unistd.h>
36 36
37/* 37/*
38 * Gnu like getopt_long() and BSD4.4 getsubopt()/optreset extensions 38 * Gnu like getopt_long() and BSD4.4 getsubopt()/optreset extensions
39 */ 39 */
40#define no_argument 0 40#define no_argument 0
41#define required_argument 1 41#define required_argument 1
42#define optional_argument 2 42#define optional_argument 2
43 43
44struct option { 44struct option {
45 /* name of long option */ 45 /* name of long option */
46 const char *name; 46 const char *name;
47 /* 47 /*
48 * one of no_argument, required_argument, and optional_argument: 48 * one of no_argument, required_argument, and optional_argument:
49 * whether option takes an argument 49 * whether option takes an argument
50 */ 50 */
51 int has_arg; 51 int has_arg;
52 /* if not NULL, set *flag to val when option found */ 52 /* if not NULL, set *flag to val when option found */
53 int *flag; 53 int *flag;
54 /* if flag not NULL, value to set *flag to; else return value */ 54 /* if flag not NULL, value to set *flag to; else return value */
55 int val; 55 int val;
56}; 56};
57 57
58#ifdef __cplusplus 58#ifdef __cplusplus
59extern "C" { 59extern "C" {
60#endif 60#endif
61 61
62int getopt_long(int, char * const *, const char *, 62int getopt_long(int, char * const *, const char *,
63 const struct option *, int *); 63 const struct option *, int *);
64 64
65/* On some platforms, this is in libc, but not in a system header */ 65/* On some platforms, this is in libc, but not in a system header */
66extern int optreset; 66extern int optreset;
67#if defined(__sgi) || defined(__GLIBC__) 67#if defined(__sgi) || defined(__sun) || defined(__GLIBC__)
68extern char *optarg; 68extern char *optarg;
69extern int opterr; 69extern int opterr;
70extern int optind; 70extern int optind;
71extern int optopt; 71extern int optopt;
72#endif 72#endif
73 73
74#ifdef __cplusplus 74#ifdef __cplusplus
75}; 75};
76#endif 76#endif
77  77
78#endif /* !_GETOPT_H_ */ 78#endif /* !_GETOPT_H_ */