Fri Feb 22 01:27:55 2008 UTC ()
Update to libgetopt-1.4.3.
On IRIX, getopt.h is expected to provide extern declarations of optind
et al. (Not unistd.h) Do it here since we shadow the system header.
Part of PR pkg/38054


(tnn)
diff -r1.27 -r1.28 pkgsrc/devel/libgetopt/Makefile
diff -r1.4 -r1.5 pkgsrc/devel/libgetopt/files/getopt.h
cvs diff -r1.27 -r1.28 pkgsrc/devel/libgetopt/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libgetopt/Makefile 2008/02/16 23:38:42 1.27
+++ pkgsrc/devel/libgetopt/Makefile 2008/02/22 01:27:55 1.28
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.27 2008/02/16 23:38:42 tnn Exp $ 1# $NetBSD: Makefile,v 1.28 2008/02/22 01:27:55 tnn Exp $
2# 2#
3 3
4DISTNAME= libgetopt-1.4.2 4DISTNAME= libgetopt-1.4.3
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
12NO_CHECKSUM= YES 12NO_CHECKSUM= YES
13USE_LIBTOOL= YES 13USE_LIBTOOL= YES
14WRKSRC= ${WRKDIR}/libgetopt 14WRKSRC= ${WRKDIR}/libgetopt
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17 17
cvs diff -r1.4 -r1.5 pkgsrc/devel/libgetopt/files/getopt.h (expand / switch to unified diff)

--- pkgsrc/devel/libgetopt/files/getopt.h 2005/03/10 19:19:47 1.4
+++ pkgsrc/devel/libgetopt/files/getopt.h 2008/02/22 01:27:55 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: getopt.h,v 1.4 2005/03/10 19:19:47 tv Exp $ */ 1/* $NetBSD: getopt.h,v 1.5 2008/02/22 01:27:55 tnn 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.
@@ -62,21 +62,27 @@ struct option { @@ -62,21 +62,27 @@ struct option {
62 /* if flag not NULL, value to set *flag to; else return value */ 62 /* if flag not NULL, value to set *flag to; else return value */
63 int val; 63 int val;
64}; 64};
65 65
66#ifdef __cplusplus 66#ifdef __cplusplus
67extern "C" { 67extern "C" {
68#endif 68#endif
69 69
70int getopt_long(int, char * const *, const char *, 70int getopt_long(int, char * const *, const char *,
71 const struct option *, int *); 71 const struct option *, int *);
72 72
73/* On some platforms, this is in libc, but not in a system header */ 73/* On some platforms, this is in libc, but not in a system header */
74extern int optreset; 74extern int optreset;
 75#ifdef __sgi
 76extern char *optarg;
 77extern int opterr;
 78extern int optind;
 79extern int optopt;
 80#endif
75 81
76#ifdef __cplusplus 82#ifdef __cplusplus
77}; 83};
78#endif 84#endif
79 85
80#endif 86#endif
81  87
82#endif /* !_GETOPT_H_ */ 88#endif /* !_GETOPT_H_ */