Update 4.2.0 to 4.3.0

---------------------
2013-03-31
  4.3.0
  * New web script cdinsert-ps.pl and page cdlabelgen-form.html added.
    It now only generates .ps file, so can be hosted at any site that offers
    perl cgi support.
    No change to core cdlabelgen script and it remains at version# 4.2.0.

3 files changed, 16 insertions, 18 deletions

diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile
index c64fe2422f5..5a1e3578c63 100644
--- a/graphics/cdlabelgen/Makefile
+++ b/graphics/cdlabelgen/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2014/05/29 23:36:37 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/02/05 11:29:48 mef Exp $
 
-DISTNAME=	cdlabelgen-4.2.0
-#KGREVISION=	1
-PKGREVISION=	2
+DISTNAME=	cdlabelgen-4.3.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.aczoom.com/pub/tools/
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/cdlabelgen/distinfo b/graphics/cdlabelgen/distinfo
index 33f9e1f54fd..aae1cc95893 100644
--- a/graphics/cdlabelgen/distinfo
+++ b/graphics/cdlabelgen/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.17 2013/02/16 08:56:45 shattered Exp $
+$NetBSD: distinfo,v 1.18 2015/02/05 11:29:48 mef Exp $
 
-SHA1 (cdlabelgen-4.2.0.tgz) = cbad1b9de9484a6608ef37edb60a5eaafee5c1a4
-RMD160 (cdlabelgen-4.2.0.tgz) = 7623dd451625dc872a238b3a4a24a4b1883547fa
-Size (cdlabelgen-4.2.0.tgz) = 198649 bytes
+SHA1 (cdlabelgen-4.3.0.tgz) = 1f7e1c34f7a5f409da19ca768a07778191264b19
+RMD160 (cdlabelgen-4.3.0.tgz) = d6d16361b4dd3a437f8db837182b7592c2f9f391
+Size (cdlabelgen-4.3.0.tgz) = 209771 bytes
 SHA1 (patch-aa) = 9bb28d697c5d8853df9df27f1511b0122962ba5d
-SHA1 (patch-ab) = 59a4a94b044510075cdf1e1bca365ad8eb4cae74
+SHA1 (patch-ab) = 7ec65bf5dbdcf5f4c679a9170209e6165acb158c
diff --git a/graphics/cdlabelgen/patches/patch-ab b/graphics/cdlabelgen/patches/patch-ab
index 2f6d2baea26..df72191c7cb 100644
--- a/graphics/cdlabelgen/patches/patch-ab
+++ b/graphics/cdlabelgen/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2013/02/16 08:56:45 shattered Exp $
+$NetBSD: patch-ab,v 1.12 2015/02/05 11:29:48 mef Exp $
 
---- Makefile.orig	2012-04-15 22:22:19.000000000 +0000
-+++ Makefile
-@@ -10,12 +10,12 @@ ZIPVERSION = 420
+--- 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.
  
@@ -14,10 +14,10 @@ $NetBSD: patch-ab,v 1.11 2013/02/16 08:56:45 shattered Exp $
  LIB_DIR   = $(BASE_DIR)/share/cdlabelgen
 -MAN_DIR   = $(BASE_DIR)/share/man
 +MAN_DIR   = $(BASE_DIR)/$(PKGMANDIR)
- SOURCES    = cdlabelgen ChangeLog INSTALL README Makefile ../cdinsert.pl INSTALL.WEB cdlabelgen.pod cdlabelgen.1 cdlabelgen.html spec.template
+ 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
- DISTFILES = $(SOURCES) $(POSTSCRIPT)
-@@ -37,6 +37,14 @@ RPM_TOPDIR	:= $(HOME)/rpmbuild
+@@ -38,6 +38,14 @@ RPM_TOPDIR	:= $(HOME)/rpmbuild
  # ---------------
  
  all: cdlabelgen.html cdlabelgen.1
@@ -32,7 +32,7 @@ $NetBSD: patch-ab,v 1.11 2013/02/16 08:56:45 shattered Exp $
  
  cdlabelgen.html: cdlabelgen.pod
  	pod2html --outfile=$@ --infile=$?
-@@ -49,13 +57,13 @@ cdlabelgen.1: cdlabelgen.pod
+@@ -50,13 +58,13 @@ cdlabelgen.1: cdlabelgen.pod
  install: all
  	@echo "Installing cdlabelgen in $(BIN_DIR) and $(LIB_DIR)"
  	@echo ""
@@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.11 2013/02/16 08:56:45 shattered Exp $
 -	$(INSTALL_DIR) $(LIB_DIR)
 +
 +	${BSD_INSTALL_SCRIPT} cdlabelgen ${DESTDIR}${BIN_DIR}
-+	${BSD_INSTALL_MAN} cdlabelgen.1 ${DESTDIR}${MAN_DIR}/man1
++	${BSD_INSTALL_MAN} cdlabelgen.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 +	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${LIB_DIR}
  	set -e; \
  	for file in $(POSTSCRIPT); do \