From 79dbd4664a78bbe4159c3ec8cd979160bf6d79fc Mon Sep 17 00:00:00 2001
From: shattered <shattered@pkgsrc.org>
Date: Sat, 16 Feb 2013 08:56:45 +0000
Subject: Update to 4.2.0.  Notable changes:

  * --tray-overlay option added - use this to overlay a EPS file onto the
      tray, for example, a barcode image.
  * cdinsert.pl now used to display initial form, as well as a
    filled-in form to allow for easy corrections/resubmits on the done page.
  * Create covers for double-sided DVD cases that hold 6 DVDs.
  * cdinsert.pl now supports "Omit title/subtitle from Cover" option.
  * Support for double-depth slim DVD cases. --slim-double-case option added.
---
 graphics/cdlabelgen/Makefile         |  6 +++---
 graphics/cdlabelgen/distinfo         | 10 +++++-----
 graphics/cdlabelgen/patches/patch-ab | 17 ++++++++---------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile
index d6f02f6cdfb..334f8b47916 100644
--- a/graphics/cdlabelgen/Makefile
+++ b/graphics/cdlabelgen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2012/10/06 14:10:43 asau Exp $
+# $NetBSD: Makefile,v 1.26 2013/02/16 08:56:45 shattered Exp $
 
-DISTNAME=	cdlabelgen-3.6.0
-PKGREVISION=	1
+DISTNAME=	cdlabelgen-4.2.0
+#KGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.aczoom.com/pub/tools/
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/cdlabelgen/distinfo b/graphics/cdlabelgen/distinfo
index 3c94fa9bf1d..33f9e1f54fd 100644
--- a/graphics/cdlabelgen/distinfo
+++ b/graphics/cdlabelgen/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2011/11/29 17:47:41 hans Exp $
+$NetBSD: distinfo,v 1.17 2013/02/16 08:56:45 shattered Exp $
 
-SHA1 (cdlabelgen-3.6.0.tgz) = 5240b375dbd67cc422d7eeaa286b3c03c3ec5805
-RMD160 (cdlabelgen-3.6.0.tgz) = fdeb8367741adb18569227f7eed7f88cdcaf1d81
-Size (cdlabelgen-3.6.0.tgz) = 186151 bytes
+SHA1 (cdlabelgen-4.2.0.tgz) = cbad1b9de9484a6608ef37edb60a5eaafee5c1a4
+RMD160 (cdlabelgen-4.2.0.tgz) = 7623dd451625dc872a238b3a4a24a4b1883547fa
+Size (cdlabelgen-4.2.0.tgz) = 198649 bytes
 SHA1 (patch-aa) = 9bb28d697c5d8853df9df27f1511b0122962ba5d
-SHA1 (patch-ab) = 253a9c5d9517204f9b27b92bbd6147a1176657e2
+SHA1 (patch-ab) = 59a4a94b044510075cdf1e1bca365ad8eb4cae74
diff --git a/graphics/cdlabelgen/patches/patch-ab b/graphics/cdlabelgen/patches/patch-ab
index 0701067a4f1..2f6d2baea26 100644
--- a/graphics/cdlabelgen/patches/patch-ab
+++ b/graphics/cdlabelgen/patches/patch-ab
@@ -1,24 +1,23 @@
-$NetBSD: patch-ab,v 1.10 2011/11/29 17:47:41 hans Exp $
+$NetBSD: patch-ab,v 1.11 2013/02/16 08:56:45 shattered Exp $
 
---- Makefile.orig	2005-08-23 17:22:44.000000000 +0200
+--- Makefile.orig	2012-04-15 22:22:19.000000000 +0000
 +++ Makefile
-@@ -8,12 +8,12 @@ ZIPVERSION = 360
+@@ -10,12 +10,12 @@ ZIPVERSION = 420
  # Change these to locations you need, also
  # remember to edit cdlabelgen and its @where_is_the_template as needed.
  
--BASE_DIR   = /usr/local
+-BASE_DIR   = /usr
 +BASE_DIR   = ${PREFIX}
  # BASE_DIR   = /usr/local
  # BASE_DIR   = /opt
  BIN_DIR   = $(BASE_DIR)/bin
--LIB_DIR   = $(BASE_DIR)/lib/cdlabelgen
--MAN_DIR   = $(BASE_DIR)/man
-+LIB_DIR   = $(BASE_DIR)/share/cdlabelgen
+ 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
  POSTSCRIPT = template.ps *.eps
  DISTFILES = $(SOURCES) $(POSTSCRIPT)
-@@ -31,6 +31,14 @@ INSTALL_FILE	:= install -m 0644
+@@ -37,6 +37,14 @@ RPM_TOPDIR	:= $(HOME)/rpmbuild
  # ---------------
  
  all: cdlabelgen.html cdlabelgen.1
@@ -33,7 +32,7 @@ $NetBSD: patch-ab,v 1.10 2011/11/29 17:47:41 hans Exp $
  
  cdlabelgen.html: cdlabelgen.pod
  	pod2html --outfile=$@ --infile=$?
-@@ -43,13 +51,13 @@ cdlabelgen.1: cdlabelgen.pod
+@@ -49,13 +57,13 @@ cdlabelgen.1: cdlabelgen.pod
  install: all
  	@echo "Installing cdlabelgen in $(BIN_DIR) and $(LIB_DIR)"
  	@echo ""
-- 
cgit v1.2.3