From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 20 17:10:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8897563F for ; Sat, 20 Oct 2012 17:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.FreeBSD.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 5DF558FC0C for ; Sat, 20 Oct 2012 17:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9KHA1uw008008 for ; Sat, 20 Oct 2012 17:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9KHA150008007; Sat, 20 Oct 2012 17:10:01 GMT (envelope-from gnats) Resent-Date: Sat, 20 Oct 2012 17:10:01 GMT Resent-Message-Id: <201210201710.q9KHA150008007@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Douglas Carmichael Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4FE4363D for ; Sat, 20 Oct 2012 17:09:32 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 2CADF8FC0A for ; Sat, 20 Oct 2012 17:09:32 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q9KH9VTK018225 for ; Sat, 20 Oct 2012 17:09:31 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q9KH9VGU018224; Sat, 20 Oct 2012 17:09:31 GMT (envelope-from nobody) Message-Id: <201210201709.q9KH9VGU018224@red.freebsd.org> Date: Sat, 20 Oct 2012 17:09:31 GMT From: Douglas Carmichael To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/172911: I have fixed the misc/getopt port so that it successfully compiles X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Oct 2012 17:10:01 -0000 >Number: 172911 >Category: ports >Synopsis: I have fixed the misc/getopt port so that it successfully compiles >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 20 17:10:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Douglas Carmichael >Release: 9.0-RELEASE >Organization: n/a >Environment: FreeBSD dc-freebsd90.carmichael.lan 9.0-RELEASE-p4 FreeBSD 9.0-RELEASE-p4 #0: Fri Aug 24 15:12:26 CDT 2012 root@dc-freebsd90.carmichael.lan:/usr/src/sys/amd64/compile/VMWARE90-64 amd64 >Description: I was unable to compile the misc/getopt port, and I have made some updates to it so it can be compiled. A patch is attached. >How-To-Repeat: n/a >Fix: n/a Patch attached with submission follows: diff -ruN getopt.orig/distinfo getopt/distinfo --- getopt.orig/distinfo 2012-10-20 12:02:33.000000000 -0500 +++ getopt/distinfo 2012-10-20 12:03:40.000000000 -0500 @@ -1,2 +1,2 @@ -SHA256 (getopt-1.1.4.tar.gz) = 41083d9993c26792851e79b81a0991996a3f61e14998fdd607615cc3bf933bab -SIZE (getopt-1.1.4.tar.gz) = 37163 +SHA256 (getopt-1.1.5.tar.gz) = 11893276b94b1629606ab75772143918a5713259950fbf4216288e246f19fbb6 +SIZE (getopt-1.1.5.tar.gz) = 51794 diff -ruN getopt.orig/files/patch-Makefile getopt/files/patch-Makefile --- getopt.orig/files/patch-Makefile 2012-10-20 12:02:33.000000000 -0500 +++ getopt/files/patch-Makefile 1969-12-31 18:00:00.000000000 -0600 @@ -1,38 +0,0 @@ ---- Makefile.orig Thu Jan 23 23:52:29 2003 -+++ Makefile Thu Jun 5 16:17:44 2003 -@@ -1,7 +1,7 @@ - .SUFFIXES: - - DESTDIR= --prefix=/usr/local -+prefix=$(PREFIX) - bindir=$(prefix)/bin - mandir=$(prefix)/man - man1dir=$(mandir)/man1 -@@ -29,7 +29,7 @@ - LANGUAGES = cs de es fr it ja nl pt_BR - MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES)) - --CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITH_GETTEXT=$(WITH_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -+CPPFLAGS+=-DLIBCGETOPT=$(LIBCGETOPT) -DWITH_GETTEXT=$(WITH_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX - ifeq ($(LIBCGETOPT),0) - CPPFLAGS+=-I./gnu - endif -@@ -39,8 +39,6 @@ - -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ - -Wnested-externs -Winline - OPTIMIZE=-O3 -fno-strength-reduce --CFLAGS=$(WARNINGS) $(OPTIMIZE) --LDFLAGS= - - sources=getopt.c - ifeq ($(LIBCGETOPT),0) -@@ -71,7 +69,7 @@ - getopt-test.bash getopt-test.tcsh \ - $(DESTDIR)$(getoptdir) - --ifeq ($(WITH_GETTEXT),1) -+ifeq ($(WITHOUT_GETTEXT),0) - all_po: $(MOFILES) - install_po: all_po - $(INSTALL) -m 755 -d $(DESTDIR)$(localedir) diff -ruN getopt.orig/files/patch-getopt.c getopt/files/patch-getopt.c --- getopt.orig/files/patch-getopt.c 2012-10-20 12:02:33.000000000 -0500 +++ getopt/files/patch-getopt.c 1969-12-31 18:00:00.000000000 -0600 @@ -1,55 +0,0 @@ ---- getopt.c.orig Thu Jun 5 16:00:34 2003 -+++ getopt.c Thu Jun 5 16:02:34 2003 -@@ -66,7 +66,6 @@ - int quiet_errors=0; /* 0 is not quiet. */ - int quiet_output=0; /* 0 is not quiet. */ - int quote=1; /* 1 is do quote. */ --int alternative=0; /* 0 is getopt_long, 1 is getopt_long_only */ - - /* Function prototypes */ - void *our_malloc(size_t size); -@@ -188,9 +187,7 @@ - opterr=0; - optind=0; /* Reset getopt(3) */ - -- while ((opt = (alternative? -- getopt_long_only(argc,argv,optstr,longopts,&longindex): -- getopt_long(argc,argv,optstr,longopts,&longindex))) -+ while ((opt = getopt_long(argc,argv,optstr,longopts,&longindex)) - != EOF) - if (opt == '?' || opt == ':' ) - exit_code = 1; -@@ -325,7 +322,6 @@ - fputs(_(" getopt [options] [--] optstring parameters\n"),stderr); - fputs(_(" getopt [options] -o|--options optstring [options] [--]\n"),stderr); - fputs(_(" parameters\n"),stderr); -- fputs(_(" -a, --alternative Allow long options starting with single -\n"),stderr); - fputs(_(" -h, --help This small usage guide\n"),stderr); - fputs(_(" -l, --longoptions=longopts Long options to be recognized\n"),stderr); - fputs(_(" -n, --name=progname The name under which errors are reported\n"),stderr); -@@ -355,14 +351,13 @@ - {"test",no_argument,NULL,'T'}, - {"unquoted",no_argument,NULL,'u'}, - {"help",no_argument,NULL,'h'}, -- {"alternative",no_argument,NULL,'a'}, - {"name",required_argument,NULL,'n'}, - {"version",no_argument,NULL,'V'}, - {NULL,0,NULL,0} - }; - - /* Stop scanning as soon as a non-option argument is found! */ --static const char *shortopts="+ao:l:n:qQs:TuhV"; -+static const char *shortopts="+o:l:n:qQs:TuhV"; - - int main(int argc, char *argv[]) - { -@@ -405,9 +400,6 @@ - - while ((opt=getopt_long(argc,argv,shortopts,longopts,NULL)) != EOF) - switch (opt) { -- case 'a': -- alternative=1; -- break; - case 'h': - print_help(); - exit(0); >Release-Note: >Audit-Trail: >Unformatted: