Changes 1.1.5:

Sync with util-linux 2.21. More translations. Fixed some build problems. No known bugs.

4 files changed, 22 insertions, 24 deletions

diff --git a/misc/getopt/Makefile b/misc/getopt/Makefile
index 3ce94cecdbe..d9df5f58636 100644
--- a/misc/getopt/Makefile
+++ b/misc/getopt/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2012/10/08 09:57:22 asau Exp $
-#
+# $NetBSD: Makefile,v 1.14 2013/04/11 11:45:44 adam Exp $
 
-DISTNAME=		getopt-1.1.4
-PKGREVISION=		1
-CATEGORIES=		misc
-MASTER_SITES=		http://software.frodo.looijaard.name/getopt/files/
+DISTNAME=	getopt-1.1.5
+CATEGORIES=	misc
+MASTER_SITES=	http://software.frodo.looijaard.name/getopt/files/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://software.frodo.looijaard.name/getopt/
-COMMENT=		Program to help shell scripts parse command-line parameters
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://software.frodo.looijaard.name/getopt/
+COMMENT=	Program to help shell scripts parse command-line parameters
+LICENSE=	gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/misc/getopt/distinfo b/misc/getopt/distinfo
index a5c65e76e97..ac70d65d31b 100644
--- a/misc/getopt/distinfo
+++ b/misc/getopt/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2008/01/15 23:59:09 wiz Exp $
+$NetBSD: distinfo,v 1.4 2013/04/11 11:45:44 adam Exp $
 
-SHA1 (getopt-1.1.4.tar.gz) = 8b9b329b3a8f5d52c91c0381616ecbd1ba291486
-RMD160 (getopt-1.1.4.tar.gz) = 79fffccf1b48956bfc1fbb19c22c2d94adf10dff
-Size (getopt-1.1.4.tar.gz) = 37163 bytes
-SHA1 (patch-aa) = 33e467672d3f2b7a11a60c937dcb2aff032548eb
-SHA1 (patch-ab) = 32b6b41c134c73ee743ea67928991de8fe4db23a
+SHA1 (getopt-1.1.5.tar.gz) = 9090eb46ac92f2fd2749ca4121e81aaad40f325d
+RMD160 (getopt-1.1.5.tar.gz) = 5cdef902ada45ba5e8a66a1357be8189b0cc634f
+Size (getopt-1.1.5.tar.gz) = 51794 bytes
+SHA1 (patch-aa) = 5967a6ec48a7a69078fc1e0fca26645fd9870f77
+SHA1 (patch-ab) = 9e54cdf7a96578334cce2e27201e0bb42800749e
diff --git a/misc/getopt/patches/patch-aa b/misc/getopt/patches/patch-aa
index fb9c4228b08..db402a81b7a 100644
--- a/misc/getopt/patches/patch-aa
+++ b/misc/getopt/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/12/26 15:55:39 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2013/04/11 11:45:44 adam Exp $
 
 --- getopt.c.orig	2003-01-23 21:51:24.000000000 +0100
 +++ getopt.c
-@@ -42,6 +42,7 @@
+@@ -58,6 +58,7 @@
  #include <string.h>
  #include <unistd.h>
  #include <ctype.h>
diff --git a/misc/getopt/patches/patch-ab b/misc/getopt/patches/patch-ab
index ff7ea7c5aa9..6e86ba7c3b6 100644
--- a/misc/getopt/patches/patch-ab
+++ b/misc/getopt/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/12/26 15:55:39 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2013/04/11 11:45:44 adam Exp $
 
---- Makefile.orig	2003-01-23 21:52:29.000000000 +0100
+--- Makefile.orig	2012-08-12 09:07:43.000000000 +0000
 +++ Makefile
 @@ -1,7 +1,7 @@
  .SUFFIXES:
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/12/26 15:55:39 wiz Exp $
  bindir=$(prefix)/bin
  mandir=$(prefix)/man
  man1dir=$(mandir)/man1
-@@ -11,7 +11,7 @@ getoptdir=$(libdir)/getopt
+@@ -10,7 +10,7 @@ getoptdir=$(sharedir)/getopt
  localedir=$(sharedir)/locale
  
  # Define this to 0 to use the getopt(3) routines in this package.
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/12/26 15:55:39 wiz Exp $
  
  # Define this to 1 if you do not have the gettext routines
  WITHOUT_GETTEXT=0
-@@ -20,8 +20,6 @@ WITHOUT_GETTEXT=0
+@@ -23,8 +23,6 @@ UNLIKELYNAME=a8vwjfd92
  
  SHELL=/bin/sh
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/12/26 15:55:39 wiz Exp $
  RM=rm -f
  INSTALL=install
  MSGFMT=msgfmt
-@@ -39,8 +37,7 @@ WARNINGS=-Wall \
+@@ -42,8 +40,7 @@ WARNINGS=-Wall \
           -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
           -Wnested-externs -Winline
  OPTIMIZE=-O3 -fno-strength-reduce
@@ -39,7 +39,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/12/26 15:55:39 wiz Exp $
  
  sources=getopt.c
  ifeq ($(LIBCGETOPT),0)
-@@ -58,7 +55,7 @@ clean: clean_po
+@@ -61,7 +58,7 @@ clean: clean_po
  	-$(RM) $(objects) $(binaries) 
  
  getopt: $(objects)