simplify PKGMANDIR fix

2 files changed, 1 insertions, 25 deletions

diff --git a/graphics/netpbm/patches/patch-common.mk b/graphics/netpbm/patches/patch-common.mk
index 3c5cd311cf6..791775ae1e9 100644
--- a/graphics/netpbm/patches/patch-common.mk
+++ b/graphics/netpbm/patches/patch-common.mk
@@ -1,4 +1,4 @@
-$NetBSD: patch-common.mk,v 1.2 2015/03/11 23:19:58 tnn Exp $
+$NetBSD: patch-common.mk,v 1.3 2015/03/12 12:35:42 tnn Exp $
 
 Simplify install target.
 --- common.mk.orig	2014-09-08 21:26:50.000000000 +0000
@@ -12,12 +12,3 @@ Simplify install target.
    $(PKGMANSUBDIRS:%=$(PKGMANDIR)/%)
  
  $(PKGSUBDIRS:%=$(PKGDIR)/%):
-@@ -510,7 +510,7 @@ install.man: install.man1 install.man3 i
- 
- MANUALS1 = $(BINARIES) $(SCRIPTS)
- 
--PKGMANDIR = man
-+PKGMANDIR? = man
- 
- install.man1: $(MANUALS1:%=%_installman1)
- 
diff --git a/graphics/netpbm/patches/patch-config.mk b/graphics/netpbm/patches/patch-config.mk
deleted file mode 100644
index ff24972ac7e..00000000000
--- a/graphics/netpbm/patches/patch-config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-config.mk,v 1.1 2015/03/11 23:19:58 tnn Exp $
-
-Honour PKGMANDIR
-
---- config.mk.orig	2015-03-11 23:13:16.000000000 +0000
-+++ config.mk
-@@ -548,7 +548,7 @@ RESULTDIR_DEFAULT = /tmp/netpbm-test
- 
- # Subdirectory of the package directory ($(pkgdir)) in which man pages
- # go.
--PKGMANDIR = man
-+PKGMANDIR? = man
- 
- # File permissions for installed files.
- # Note that on some systems (e.g. Solaris), 'install' can't use the