try to clean up a bit

there is no point in using msgfmt if the result isn't installed

4 files changed, 14 insertions, 33 deletions

diff --git a/misc/getopt/Makefile b/misc/getopt/Makefile
index efc912aee22..56cf44a3e5b 100644
--- a/misc/getopt/Makefile
+++ b/misc/getopt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/04/12 19:59:38 adam Exp $
+# $NetBSD: Makefile,v 1.16 2013/04/12 22:26:44 drochner Exp $
 
 DISTNAME=	getopt-1.1.5
 CATEGORIES=	misc
@@ -11,10 +11,13 @@ LICENSE=	gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_TOOLS+=		gmake msgfmt
+USE_TOOLS+=		gmake
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
+post-extract:
+	${RM} ${WRKSRC}/gnu/*.o
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/getopt ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/getopt.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff --git a/misc/getopt/distinfo b/misc/getopt/distinfo
index d48ed05f0c4..1132dc62f46 100644
--- a/misc/getopt/distinfo
+++ b/misc/getopt/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2013/04/12 19:59:38 adam Exp $
+$NetBSD: distinfo,v 1.6 2013/04/12 22:26:44 drochner Exp $
 
 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
-SHA1 (patch-getopt.c) = cd1cb9e7975717618bf80ede7278ab591298d5ef
+SHA1 (patch-ab) = 8591f15916b47d3569c79639e6ee9aa82df07f6a
diff --git a/misc/getopt/patches/patch-ab b/misc/getopt/patches/patch-ab
index 6e86ba7c3b6..ec8828dab25 100644
--- a/misc/getopt/patches/patch-ab
+++ b/misc/getopt/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2013/04/11 11:45:44 adam Exp $
+$NetBSD: patch-ab,v 1.3 2013/04/12 22:26:44 drochner Exp $
 
 --- Makefile.orig	2012-08-12 09:07:43.000000000 +0000
 +++ Makefile
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2013/04/11 11:45:44 adam Exp $
  bindir=$(prefix)/bin
  mandir=$(prefix)/man
  man1dir=$(mandir)/man1
-@@ -10,7 +10,7 @@ getoptdir=$(sharedir)/getopt
+@@ -10,10 +10,10 @@ getoptdir=$(sharedir)/getopt
  localedir=$(sharedir)/locale
  
  # Define this to 0 to use the getopt(3) routines in this package.
@@ -19,7 +19,11 @@ $NetBSD: patch-ab,v 1.2 2013/04/11 11:45:44 adam Exp $
 +LIBCGETOPT=0
  
  # Define this to 1 if you do not have the gettext routines
- WITHOUT_GETTEXT=0
+-WITHOUT_GETTEXT=0
++WITHOUT_GETTEXT=1
+ 
+ # For creating the archive
+ PACKAGE=getopt
 @@ -23,8 +23,6 @@ UNLIKELYNAME=a8vwjfd92
  
  SHELL=/bin/sh
@@ -39,12 +43,3 @@ $NetBSD: patch-ab,v 1.2 2013/04/11 11:45:44 adam Exp $
  
  sources=getopt.c
  ifeq ($(LIBCGETOPT),0)
-@@ -61,7 +58,7 @@ clean: clean_po
- 	-$(RM) $(objects) $(binaries) 
- 
- getopt: $(objects)
--	$(CC) $(LDFLAGS) -o $@ $(objects)
-+	$(CC) $(LDFLAGS) -o $@ $(objects) -lintl
- 
- install: getopt install_po
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
diff --git a/misc/getopt/patches/patch-getopt.c b/misc/getopt/patches/patch-getopt.c
deleted file mode 100644
index b743093bf5f..00000000000
--- a/misc/getopt/patches/patch-getopt.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-getopt.c,v 1.1 2013/04/12 20:00:10 adam Exp $
-
---- getopt.c.orig	2013-04-12 15:23:09.000000000 +0000
-+++ getopt.c
-@@ -399,9 +399,11 @@ int main(int argc, char *argv[])
- 	while ((opt =
- 		getopt_long(argc, argv, shortopts, longopts, NULL)) != EOF)
- 		switch (opt) {
-+#ifndef __NetBSD__
- 		case 'a':
- 			getopt_long_fp = getopt_long_only;
- 			break;
-+#endif
- 		case 'h':
- 			print_help();
- 		case 'o':