[pkgsrc/trunk]: pkgsrc/devel/libgetopt libgetopt-1.4.6: Don't replace getopt ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ef8d08bf8a2
branches:  trunk
changeset: 639372:6ef8d08bf8a2
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Sep 11 21:48:34 2014 +0000

description:
libgetopt-1.4.6: Don't replace getopt on SunOS.

diffstat:

 devel/libgetopt/Makefile       |  8 ++++----
 devel/libgetopt/buildlink3.mk  |  4 ++--
 devel/libgetopt/files/getopt.h |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diffs (65 lines):

diff -r b136f2a666d8 -r 6ef8d08bf8a2 devel/libgetopt/Makefile
--- a/devel/libgetopt/Makefile  Thu Sep 11 21:35:33 2014 +0000
+++ b/devel/libgetopt/Makefile  Thu Sep 11 21:48:34 2014 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2014/01/01 02:48:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2014/09/11 21:48:34 jperkin Exp $
 #
 
-DISTNAME=      libgetopt-1.4.5
+DISTNAME=      libgetopt-1.4.6
 CATEGORIES=    pkgtools sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -9,14 +9,14 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Library for handling --long options
 
-CONFLICTS=             man-pages-[0-9]*
+CONFLICTS=     man-pages-[0-9]*
 
 USE_LIBTOOL=   YES
 WRKSRC=                ${WRKDIR}/libgetopt
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "AIX" || ${OPSYS} == "HPUX" || \
+.if ${OPSYS} == "AIX" || ${OPSYS} == "HPUX" || \
        ${OPSYS} == "OSF1" || ${OPSYS} == "Linux"
 CFLAGS+=       -DREPLACE_GETOPT
 .endif
diff -r b136f2a666d8 -r 6ef8d08bf8a2 devel/libgetopt/buildlink3.mk
--- a/devel/libgetopt/buildlink3.mk     Thu Sep 11 21:35:33 2014 +0000
+++ b/devel/libgetopt/buildlink3.mk     Thu Sep 11 21:48:34 2014 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.14 2014/01/01 02:48:31 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2014/09/11 21:48:34 jperkin Exp $
 
 BUILDLINK_TREE+=       getopt
 
 .if !defined(LIBGETOPT_BUILDLINK3_MK)
 LIBGETOPT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.getopt+= libgetopt>=1.4.5
+BUILDLINK_API_DEPENDS.getopt+= libgetopt>=1.4.6
 BUILDLINK_PKGSRCDIR.getopt?=   ../../devel/libgetopt
 .endif # LIBGETOPT_BUILDLINK3_MK
 
diff -r b136f2a666d8 -r 6ef8d08bf8a2 devel/libgetopt/files/getopt.h
--- a/devel/libgetopt/files/getopt.h    Thu Sep 11 21:35:33 2014 +0000
+++ b/devel/libgetopt/files/getopt.h    Thu Sep 11 21:48:34 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getopt.h,v 1.8 2014/01/01 02:48:31 ryoon Exp $ */
+/*     $NetBSD: getopt.h,v 1.9 2014/09/11 21:48:34 jperkin Exp $       */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
 
 /* On some platforms, this is in libc, but not in a system header */
 extern int optreset;
-#if defined(__sgi) || defined(__GLIBC__)
+#if defined(__sgi) || defined(__sun) || defined(__GLIBC__)
 extern char *optarg;
 extern int opterr;
 extern int optind;