diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-09-11 21:48:34 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-09-11 21:48:34 +0000 |
| commit | 59f4cc1d878347e2858fa2478b5370161774372a (patch) | |
| tree | 91d7c045c1439318cf4325a74ef6f9462cac132a | |
| parent | ea28f4b28b367583247ac91edbae344f944de956 (diff) | |
| download | pkgsrc-59f4cc1d878347e2858fa2478b5370161774372a.tar.gz | |
libgetopt-1.4.6: Don't replace getopt on SunOS.
| -rw-r--r-- | devel/libgetopt/Makefile | 8 | ||||
| -rw-r--r-- | devel/libgetopt/buildlink3.mk | 4 | ||||
| -rw-r--r-- | devel/libgetopt/files/getopt.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/devel/libgetopt/Makefile b/devel/libgetopt/Makefile index 08cb1764d39..6db457ef7fb 100644 --- a/devel/libgetopt/Makefile +++ b/devel/libgetopt/Makefile @@ -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 @@ DISTFILES= # empty MAINTAINER= pkgsrc-users@NetBSD.org 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 --git a/devel/libgetopt/buildlink3.mk b/devel/libgetopt/buildlink3.mk index a823b26d682..80dd0afcf52 100644 --- a/devel/libgetopt/buildlink3.mk +++ b/devel/libgetopt/buildlink3.mk @@ -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 --git a/devel/libgetopt/files/getopt.h b/devel/libgetopt/files/getopt.h index 2e2af87ca5a..fb20cfa0164 100644 --- a/devel/libgetopt/files/getopt.h +++ b/devel/libgetopt/files/getopt.h @@ -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 @@ int getopt_long(int, char * const *, const char *, /* 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; |