graphics/cdlabelgen: Remove perldoc(1) as a build tool.

There is no documentation in the "cdlabelgen" script that can be
extracted using perldoc(1).  Remove the rule invoking perldoc(1)
and remove the need for perldoc(1) as a build tool, which fixes the
build error due to missing
documentation.

Greatly simplify the patch to the project Makefile by moving some
of the logic in the package Makefile.  Almost no changes to the
package Makefile are needed if the appropriate variables are
overridden on the make(1) command line.

3 files changed, 30 insertions, 54 deletions

diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile
index e763428c5fd..06f57a03872 100644
--- a/graphics/cdlabelgen/Makefile
+++ b/graphics/cdlabelgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2017/08/01 14:58:59 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2017/08/23 17:53:55 jlam Exp $
 
 DISTNAME=	cdlabelgen-4.3.0
 PKGREVISION=	2
@@ -10,16 +10,24 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.aczoom.com/tools/cdinsert/
 COMMENT=	Generate frontcards and traycards for CDs
 
-USE_TOOLS+=	perl:run perldoc
+USE_TOOLS+=	perl:run
 USE_LANGUAGES=	# empty
 REPLACE_PERL+=	cdlabelgen
 
-MAKE_ENV+=	SED=${SED:Q}
-MAKE_ENV+=	MV=${MV:Q}
+MAKE_FLAGS+=	BASE_DIR=${DESTDIR:Q}${PREFIX:Q}
+MAKE_FLAGS+=	MAN_DIR=${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR:Q}
+MAKE_FLAGS+=	INSTALL=${INSTALL_SCRIPT:Q}
+MAKE_FLAGS+=	INSTALL_FILE=${INSTALL_DATA:Q}
+MAKE_FLAGS+=	INSTALL_MAN=${INSTALL_MAN:Q}
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin share/cdlabelgen ${PKGMANDIR}/man1
 
 post-extract:
 	cd ${WRKSRC} && ${CHMOD} go+r *
 
+post-build:
+	cd ${WRKSRC} && \
+	${SED} -e "s,@PREFIX@,${PREFIX},g" cdlabelgen > cdlabelgen.new && \
+	${MV} cdlabelgen.new cdlabelgen
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cdlabelgen/distinfo b/graphics/cdlabelgen/distinfo
index 03fc46713fd..b4b5e71d029 100644
--- a/graphics/cdlabelgen/distinfo
+++ b/graphics/cdlabelgen/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2015/11/03 21:33:53 agc Exp $
+$NetBSD: distinfo,v 1.20 2017/08/23 17:53:55 jlam Exp $
 
 SHA1 (cdlabelgen-4.3.0.tgz) = 1f7e1c34f7a5f409da19ca768a07778191264b19
 RMD160 (cdlabelgen-4.3.0.tgz) = d6d16361b4dd3a437f8db837182b7592c2f9f391
 SHA512 (cdlabelgen-4.3.0.tgz) = e9528dc1cfead1f3a90b2109346ac1e5305875e2a10dc3196a1caa94fb6e30daeff4bdac5eb43cb6710fdf36fc98349fdeaa225eaa6db3825bf9fd33cc9ab8cf
 Size (cdlabelgen-4.3.0.tgz) = 209771 bytes
 SHA1 (patch-aa) = 9bb28d697c5d8853df9df27f1511b0122962ba5d
-SHA1 (patch-ab) = 7ec65bf5dbdcf5f4c679a9170209e6165acb158c
+SHA1 (patch-ab) = eb59fdb4a1afdee8c731f294c2a9677237288d87
diff --git a/graphics/cdlabelgen/patches/patch-ab b/graphics/cdlabelgen/patches/patch-ab
index df72191c7cb..3a0bf43f55e 100644
--- a/graphics/cdlabelgen/patches/patch-ab
+++ b/graphics/cdlabelgen/patches/patch-ab
@@ -1,53 +1,21 @@
-$NetBSD: patch-ab,v 1.12 2015/02/05 11:29:48 mef Exp $
+$NetBSD: patch-ab,v 1.13 2017/08/23 17:53:55 jlam Exp $
 
---- Makefile.orig	2013-04-01 04:37:51.000000000 +0900
-+++ Makefile	2015-02-05 18:58:24.000000000 +0900
-@@ -10,12 +10,12 @@ ZIPVERSION = 430
- # Change these to locations you need, also
- # remember to edit cdlabelgen and its @where_is_the_template as needed.
+--- Makefile.orig	2013-03-31 19:37:51.000000000 +0000
++++ Makefile
+@@ -25,6 +25,7 @@ DISTFILES = $(SOURCES) $(POSTSCRIPT)
+ INSTALL		:= install -m 0755
+ INSTALL_DIR	:= install -d -m 0755
+ INSTALL_FILE	:= install -m 0644
++INSTALL_MAN	:= install -m 0644
  
--BASE_DIR   = /usr
-+BASE_DIR   = ${PREFIX}
- # BASE_DIR   = /usr/local
- # BASE_DIR   = /opt
- BIN_DIR   = $(BASE_DIR)/bin
- LIB_DIR   = $(BASE_DIR)/share/cdlabelgen
--MAN_DIR   = $(BASE_DIR)/share/man
-+MAN_DIR   = $(BASE_DIR)/$(PKGMANDIR)
- WEBSOURCES= ../cdinsert.pl ../cdinsert-ps.pl ../cdlabelgen-form.html
- SOURCES    = cdlabelgen ChangeLog INSTALL README Makefile INSTALL.WEB cdlabelgen.pod cdlabelgen.1 cdlabelgen.html spec.template $(WEBSOURCES)
- POSTSCRIPT = template.ps *.eps
-@@ -38,6 +38,14 @@ RPM_TOPDIR	:= $(HOME)/rpmbuild
- # ---------------
- 
- all: cdlabelgen.html cdlabelgen.1
-+	${SED} s=@PREFIX@=${PREFIX}=g <cdlabelgen >cdlabelgen.new
-+	${MV} cdlabelgen.new cdlabelgen
-+	if [ `id -u` -eq 0 ]; then	\
-+		perldoc_flags="-U";	\
-+	else				\
-+		perldoc_flags="";	\
-+	fi;				\
-+	perldoc $$perldoc_flags cdlabelgen >cdlabelgen.0
- 
- cdlabelgen.html: cdlabelgen.pod
- 	pod2html --outfile=$@ --infile=$?
-@@ -50,13 +58,13 @@ cdlabelgen.1: cdlabelgen.pod
- install: all
- 	@echo "Installing cdlabelgen in $(BIN_DIR) and $(LIB_DIR)"
+ # Makefile macros....
+ #1.  $@ is the name of the file to be made.
+@@ -52,7 +53,7 @@ install: all
  	@echo ""
--	$(INSTALL_DIR) $(BIN_DIR)
--	$(INSTALL) cdlabelgen $(BIN_DIR)
+ 	$(INSTALL_DIR) $(BIN_DIR)
+ 	$(INSTALL) cdlabelgen $(BIN_DIR)
 -	$(INSTALL_FILE) cdlabelgen.1 $(MAN_DIR)/man1
--	$(INSTALL_DIR) $(LIB_DIR)
-+
-+	${BSD_INSTALL_SCRIPT} cdlabelgen ${DESTDIR}${BIN_DIR}
-+	${BSD_INSTALL_MAN} cdlabelgen.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${LIB_DIR}
++	$(INSTALL_MAN) cdlabelgen.1 $(MAN_DIR)/man1
+ 	$(INSTALL_DIR) $(LIB_DIR)
  	set -e; \
  	for file in $(POSTSCRIPT); do \
--		$(INSTALL_FILE) postscript/$$file $(LIB_DIR)/; \
-+		${BSD_INSTALL_DATA} postscript/$$file ${DESTDIR}${LIB_DIR}; \
- 	done
- 	@echo "** Done. Check $(BIN_DIR)/cdlabelgen and fix @where_is_the_template - if needed!"
-