cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- honor CC

Browse Source 
- while here, regen patches and plist, and add a license version
This commit is contained in:
jasper 2009-01-18 23:19:15 +00:00
parent 235a177962
commit b6eba3d391
5 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
misc/gnugetopt/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.5 2008/08/19 22:17:49 jasper Exp $
# $OpenBSD: Makefile,v 1.6 2009/01/18 23:19:15 jasper Exp $
COMMENT= GNU getopt(1) utility
DISTNAME= getopt-1.1.4
PKGNAME= gnu${DISTNAME}p0
PKGNAME= gnu${DISTNAME}p1
CATEGORIES= misc
HOMEPAGE= http://software.frodo.looijaard.name/getopt/
# GPL
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -22,7 +22,8 @@ MODULES= devel/gettext
USE_GMAKE= Yes
MAKE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl -liconv"
LDFLAGS="-L${LOCALBASE}/lib -lintl -liconv" \
CC="${CC}"
NO_REGRESS= Yes

13
misc/gnugetopt/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2006/11/03 13:25:02 bernd Exp $
$OpenBSD: patch-Makefile,v 1.2 2009/01/18 23:19:15 jasper Exp $
--- Makefile.orig Mon Nov 7 23:32:46 2005
+++ Makefile Thu Nov 2 15:07:47 2006
+++ Makefile Mon Jan 19 00:17:30 2009
@@ -1,17 +1,17 @@
.SUFFIXES:
@ -22,6 +22,15 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2006/11/03 13:25:02 bernd Exp $
# Define this to 1 if you do not have the gettext routines
WITHOUT_GETTEXT=0
@@ -24,7 +24,7 @@ UNLIKELYNAME=a8vwjfd92
SHELL=/bin/sh
-CC=gcc
+CC?=gcc
LD=ld
RM=rm -f
INSTALL=install
@@ -33,7 +33,7 @@ MSGFMT=msgfmt
LANGUAGES = cs de es fr it ja nl pt_BR
MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))

12
misc/gnugetopt/patches/patch-getopt_1
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-getopt_1,v 1.1.1.1 2006/11/03 13:25:02 bernd Exp $
$OpenBSD: patch-getopt_1,v 1.2 2009/01/18 23:19:15 jasper Exp $
--- getopt.1.orig Mon Nov 7 23:16:38 2005
+++ getopt.1 Thu Nov 2 15:21:45 2006
+++ getopt.1 Mon Jan 19 00:17:18 2009
@@ -1,14 +1,14 @@
-.TH GETOPT 1 "May 31, 1997" Linux ""
+.TH GNUGETOPT 1 "May 31, 1997" Linux ""
@ -77,7 +77,7 @@ $OpenBSD: patch-getopt_1,v 1.1.1.1 2006/11/03 13:25:02 bernd Exp $
that does not start with
a
.RB ` \- '
@@ -121,10 +121,10 @@ options are parsed and output is generat
@@ -121,10 +121,10 @@ options are parsed and output is generated (see sectio
.B SCANNING MODES
for details).
.IP "\-q, \-\-quiet"
@ -90,7 +90,7 @@ $OpenBSD: patch-getopt_1,v 1.1.1.1 2006/11/03 13:25:02 bernd Exp $
unless you also use
.IR \-q .
.IP "\-s, \-\-shell shell"
@@ -144,7 +144,7 @@ characters can cause havoc in this mode
@@ -144,7 +144,7 @@ characters can cause havoc in this mode (like they do
implementations).
.IP "\-T \-\-test"
Test if your
@ -108,7 +108,7 @@ $OpenBSD: patch-getopt_1,v 1.1.1.1 2006/11/03 13:25:02 bernd Exp $
(the
.I parameters
in the
@@ -170,7 +170,7 @@ generated. These parameters were typical
@@ -170,7 +170,7 @@ generated. These parameters were typically the paramet
was called with.
Care must be taken that each parameter the shell function was
called with corresponds to exactly one parameter in the parameter list of
@ -117,7 +117,7 @@ $OpenBSD: patch-getopt_1,v 1.1.1.1 2006/11/03 13:25:02 bernd Exp $
(see the
.BR EXAMPLES ).
All parsing is done by the GNU
@@ -355,14 +355,14 @@ parameter is still generated, but it wil
@@ -355,14 +355,14 @@ parameter is still generated, but it will always be th
this mode.
.SH COMPATIBILITY
This version of

8
misc/gnugetopt/patches/patch-getopt_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-getopt_c,v 1.1.1.1 2006/11/03 13:25:02 bernd Exp $
$OpenBSD: patch-getopt_c,v 1.2 2009/01/18 23:19:15 jasper Exp $
--- getopt.c.orig Mon Nov 7 23:17:01 2005
+++ getopt.c Fri Nov 3 14:18:16 2006
+++ getopt.c Mon Jan 19 00:17:18 2009
@@ -88,7 +88,7 @@ void *our_malloc(size_t size)
{
void *ret=malloc(size);
@ -10,7 +10,7 @@ $OpenBSD: patch-getopt_c,v 1.1.1.1 2006/11/03 13:25:02 bernd Exp $
exit(3);
}
return(ret);
@@ -98,7 +98,7 @@ void *our_realloc(void *ptr, size_t size
@@ -98,7 +98,7 @@ void *our_realloc(void *ptr, size_t size)
{
void *ret=realloc(ptr,size);
if (! ret && size) {
@ -19,7 +19,7 @@ $OpenBSD: patch-getopt_c,v 1.1.1.1 2006/11/03 13:25:02 bernd Exp $
exit(3);
}
return(ret);
@@ -231,8 +231,8 @@ int generate_output(char * argv[],int ar
@@ -231,8 +231,8 @@ int generate_output(char * argv[],int argc,const char
void parse_error(const char *message)
{
if (message)

4
misc/gnugetopt/pkg/PLIST
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/11/03 13:25:02 bernd Exp $
bin/gnugetopt
@comment $OpenBSD: PLIST,v 1.2 2009/01/18 23:19:15 jasper Exp $
@bin bin/gnugetopt
@man man/man1/gnugetopt.1
share/examples/gnugetopt/
share/examples/gnugetopt/getopt-parse.bash