Wed Dec 10 15:30:30 2008 UTC ()
libgetopt-1.4.4:
If getopt.h is included, the getopt extension is really wanted. So
remove check for _XOPEN_SOURCE and _POSIX_SOURCE, resolving errors on
AIX.


(joerg)
diff -r1.29 -r1.30 pkgsrc/devel/libgetopt/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/libgetopt/files/getopt.h
cvs diff -r1.29 -r1.30 pkgsrc/devel/libgetopt/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libgetopt/Makefile 2008/03/03 17:45:35 1.29
+++ pkgsrc/devel/libgetopt/Makefile 2008/12/10 15:30:29 1.30
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.29 2008/03/03 17:45:35 jlam Exp $ 1# $NetBSD: Makefile,v 1.30 2008/12/10 15:30:29 joerg Exp $
2# 2#
3 3
4DISTNAME= libgetopt-1.4.3 4DISTNAME= libgetopt-1.4.4
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
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14NO_CHECKSUM= YES 14NO_CHECKSUM= YES
15USE_LIBTOOL= YES 15USE_LIBTOOL= YES
16WRKSRC= ${WRKDIR}/libgetopt 16WRKSRC= ${WRKDIR}/libgetopt
17 17
cvs diff -r1.6 -r1.7 pkgsrc/devel/libgetopt/files/getopt.h (expand / switch to unified diff)

--- pkgsrc/devel/libgetopt/files/getopt.h 2008/04/29 05:46:09 1.6
+++ pkgsrc/devel/libgetopt/files/getopt.h 2008/12/10 15:30:29 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: getopt.h,v 1.6 2008/04/29 05:46:09 martin Exp $ */ 1/* $NetBSD: getopt.h,v 1.7 2008/12/10 15:30:29 joerg 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.
@@ -27,27 +27,26 @@ @@ -27,27 +27,26 @@
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#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE) 
41#define no_argument 0 40#define no_argument 0
42#define required_argument 1 41#define required_argument 1
43#define optional_argument 2 42#define optional_argument 2
44 43
45struct option { 44struct option {
46 /* name of long option */ 45 /* name of long option */
47 const char *name; 46 const char *name;
48 /* 47 /*
49 * one of no_argument, required_argument, and optional_argument: 48 * one of no_argument, required_argument, and optional_argument:
50 * whether option takes an argument 49 * whether option takes an argument
51 */ 50 */
52 int has_arg; 51 int has_arg;
53 /* if not NULL, set *flag to val when option found */ 52 /* if not NULL, set *flag to val when option found */
@@ -65,17 +64,15 @@ int getopt_long(int, char * const *, con @@ -65,17 +64,15 @@ int getopt_long(int, char * const *, con
65 64
66/* 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 */
67extern int optreset; 66extern int optreset;
68#ifdef __sgi 67#ifdef __sgi
69extern char *optarg; 68extern char *optarg;
70extern int opterr; 69extern int opterr;
71extern int optind; 70extern int optind;
72extern int optopt; 71extern int optopt;
73#endif 72#endif
74 73
75#ifdef __cplusplus 74#ifdef __cplusplus
76}; 75};
77#endif 76#endif
78 
79#endif 
80  77
81#endif /* !_GETOPT_H_ */ 78#endif /* !_GETOPT_H_ */