summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-04-05 12:28:57 +0000
committerwiz <wiz@pkgsrc.org>2011-04-05 12:28:57 +0000
commit02272098a8706a1db3cfbfddb1c97b7a525dafd2 (patch)
tree0be7c7340d7d71c7dd777cb6732c3251a5b511bd /textproc
parent42f2f897f34f2feed1807b6f70a9c5ceb559d90f (diff)
downloadpkgsrc-02272098a8706a1db3cfbfddb1c97b7a525dafd2.tar.gz
Modify patch so it matches version accepted by upstream, and fix
PREFIX issue differently.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/mdocml/Makefile3
-rw-r--r--textproc/mdocml/distinfo4
-rw-r--r--textproc/mdocml/patches/patch-Makefile13
3 files changed, 6 insertions, 14 deletions
diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index 199f9470e32..d8e9e9dd74b 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2011/04/05 09:27:31 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2011/04/05 12:28:57 wiz Exp $
DISTNAME= mdocml-1.11.1
CATEGORIES= textproc devel
@@ -10,5 +10,6 @@ COMMENT= Man page tool (mdoc macro compiler)
LICENSE= 2-clause-bsd # not exactly, but near enough
PKG_DESTDIR_SUPPORT= user-destdir
+MAKE_FLAGS+= PREFIX=${PREFIX}
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/mdocml/distinfo b/textproc/mdocml/distinfo
index d87d0f12c1a..7f61d1c05cc 100644
--- a/textproc/mdocml/distinfo
+++ b/textproc/mdocml/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2011/04/05 09:27:31 wiz Exp $
+$NetBSD: distinfo,v 1.22 2011/04/05 12:28:57 wiz Exp $
SHA1 (mdocml-1.11.1.tar.gz) = b0371cf35a9ae551becc82e4308edc910cb12611
RMD160 (mdocml-1.11.1.tar.gz) = 91491eef46ef95df8d90df3f4cc79cc3b373bbfb
Size (mdocml-1.11.1.tar.gz) = 195346 bytes
-SHA1 (patch-Makefile) = b9838af54f7fcfe2b1a929364627cd4f9de23ac7
+SHA1 (patch-Makefile) = 76fa4fa459654a4265fd05282ce94b81a81da684
diff --git a/textproc/mdocml/patches/patch-Makefile b/textproc/mdocml/patches/patch-Makefile
index 7c79009c4d0..14304fb67e9 100644
--- a/textproc/mdocml/patches/patch-Makefile
+++ b/textproc/mdocml/patches/patch-Makefile
@@ -1,18 +1,9 @@
-$NetBSD: patch-Makefile,v 1.1 2011/04/05 09:27:32 wiz Exp $
+$NetBSD: patch-Makefile,v 1.2 2011/04/05 12:28:57 wiz Exp $
-Fix installation.
+Fix installation, integrated upstream.
--- Makefile.orig 2011-04-04 22:07:17.000000000 +0000
+++ Makefile
-@@ -15,7 +15,7 @@ VERSION = 1.11.1
- VDATE = 04 April 2011
- CFLAGS += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
- CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- BINDIR = $(PREFIX)/bin
- INCLUDEDIR = $(PREFIX)/include/mandoc
- LIBDIR = $(PREFIX)/lib/mandoc
@@ -290,6 +290,7 @@ clean:
install: all
mkdir -p $(DESTDIR)$(BINDIR)