diff options
author | dholland <dholland> | 2013-04-02 15:27:11 +0000 |
---|---|---|
committer | dholland <dholland> | 2013-04-02 15:27:11 +0000 |
commit | 03f19b0e99b4ed53ed0f942230f1bca30de1c822 (patch) | |
tree | 99e8f6d499cba41f5f7f108932680352a66b4ddc /devel/sparse/patches | |
parent | 70caa0e1416922ff1a1b9fe4b9a3e2e43abf4c09 (diff) | |
download | pkgsrc-03f19b0e99b4ed53ed0f942230f1bca30de1c822.tar.gz |
Update to 0.4.4. No changelog that I can find.
patch-aa -> patch-Makefile; add comment to patch-ab.
Diffstat (limited to 'devel/sparse/patches')
-rw-r--r-- | devel/sparse/patches/patch-Makefile | 39 | ||||
-rw-r--r-- | devel/sparse/patches/patch-aa | 35 | ||||
-rw-r--r-- | devel/sparse/patches/patch-ab | 4 | ||||
-rw-r--r-- | devel/sparse/patches/patch-parse_h | 18 |
4 files changed, 42 insertions, 54 deletions
diff --git a/devel/sparse/patches/patch-Makefile b/devel/sparse/patches/patch-Makefile new file mode 100644 index 00000000000..f5017837e6f --- /dev/null +++ b/devel/sparse/patches/patch-Makefile @@ -0,0 +1,39 @@ +$NetBSD: patch-Makefile,v 1.1 2013/04/02 15:27:12 dholland Exp $ + +- honor pkgsrc's DESTDIR and PREFIX +- honor PKGMANDIR +- don't use non-portable install -v + +--- Makefile.orig 2011-11-25 05:39:36.000000000 +0000 ++++ Makefile +@@ -29,11 +29,12 @@ ifeq ($(HAVE_GCC_DEP),yes) + BASIC_CFLAGS += -Wp,-MD,$(@D)/.$(@F).d + endif + +-DESTDIR= +-PREFIX=$(HOME) ++DESTDIR?= ++PREFIX?=$(HOME) ++PKGMANDIR?=share/man + BINDIR=$(PREFIX)/bin + LIBDIR=$(PREFIX)/lib +-MANDIR=$(PREFIX)/share/man ++MANDIR=$(PREFIX)/$(PKGMANDIR) + MAN1DIR=$(MANDIR)/man1 + INCLUDEDIR=$(PREFIX)/include + PKGCONFIGDIR=$(LIBDIR)/pkgconfig +@@ -97,12 +98,12 @@ QUIET_INST_SH = $(Q:@=echo -n ' INS + QUIET_INST = $(Q:@=@echo -n ' INSTALL ';) + + define INSTALL_EXEC +- $(QUIET_INST)install -v $1 $(DESTDIR)$2/$1 || exit 1; ++ $(QUIET_INST)install $1 $(DESTDIR)$2/$1 || exit 1; + + endef + + define INSTALL_FILE +- $(QUIET_INST)install -v -m 644 $1 $(DESTDIR)$2/$1 || exit 1; ++ $(QUIET_INST)install -m 644 $1 $(DESTDIR)$2/$1 || exit 1; + + endef + diff --git a/devel/sparse/patches/patch-aa b/devel/sparse/patches/patch-aa deleted file mode 100644 index f99a8400b0a..00000000000 --- a/devel/sparse/patches/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/05/21 20:46:43 reed Exp $ - ---- Makefile.orig 2007-05-21 15:15:45.000000000 -0500 -+++ Makefile 2007-05-21 15:17:21.000000000 -0500 -@@ -15,8 +15,8 @@ - # - CFLAGS += -DDEBUG - --DESTDIR= --PREFIX=$(HOME) -+DESTDIR?= -+PREFIX?=$(HOME) - BINDIR=$(PREFIX)/bin - LIBDIR=$(PREFIX)/lib - INCLUDEDIR=$(PREFIX)/include -@@ -48,15 +48,15 @@ - install -d $(DESTDIR)$(INCLUDEDIR)/sparse - install -d $(DESTDIR)$(PKGCONFIGDIR) - for f in $(INST_PROGRAMS); do \ -- install -v $$f $(DESTDIR)$(BINDIR)/$$f || exit 1; \ -+ install $$f $(DESTDIR)$(BINDIR)/$$f || exit 1; \ - done - for f in $(LIBS); do \ -- install -m 644 -v $$f $(DESTDIR)$(LIBDIR)/$$f || exit 1; \ -+ install -m 644 $$f $(DESTDIR)$(LIBDIR)/$$f || exit 1; \ - done - for f in $(LIB_H); do \ -- install -m 644 -v $$f $(DESTDIR)$(INCLUDEDIR)/sparse/$$f || exit 1; \ -+ install -m 644 $$f $(DESTDIR)$(INCLUDEDIR)/sparse/$$f || exit 1; \ - done -- install -m 644 -v sparse.pc $(DESTDIR)$(PKGCONFIGDIR)/sparse.pc -+ install -m 644 sparse.pc $(DESTDIR)$(PKGCONFIGDIR)/sparse.pc - - sparse.pc: sparse.pc.in - sed 's|@version@|$(VERSION)|g;s|@prefix@|$(PREFIX)|g;s|@libdir@|$(LIBDIR)|g;s|@includedir@|$(INCLUDEDIR)|g' sparse.pc.in > sparse.pc diff --git a/devel/sparse/patches/patch-ab b/devel/sparse/patches/patch-ab index 71ea48cada4..854b765eff1 100644 --- a/devel/sparse/patches/patch-ab +++ b/devel/sparse/patches/patch-ab @@ -1,4 +1,6 @@ -$NetBSD: patch-ab,v 1.1 2007/06/12 14:48:33 joerg Exp $ +$NetBSD: patch-ab,v 1.2 2013/04/02 15:27:12 dholland Exp $ + +(Very?) old dfly apparently doesn't have strtold. --- compat/strtold.c.orig 2007-06-12 14:35:09.000000000 +0000 +++ compat/strtold.c diff --git a/devel/sparse/patches/patch-parse_h b/devel/sparse/patches/patch-parse_h deleted file mode 100644 index 865de5e1d0a..00000000000 --- a/devel/sparse/patches/patch-parse_h +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-parse_h,v 1.1 2013/02/21 18:12:26 dholland Exp $ - -Apply upstream patch aaff080449ebcb66553ebf5b512f737b6191f339 to fix -build with gcc 4.6+ and clang. Via Al Viro. - ---- parse.h~ 2007-05-01 18:30:58.000000000 +0000 -+++ parse.h -@@ -35,10 +35,6 @@ struct statement { - struct /* declaration */ { - struct symbol_list *declaration; - }; -- struct /* label_arg */ { -- struct symbol *label; -- struct statement *label_statement; -- }; - struct { - struct expression *expression; - struct expression *context; |