Update to cdlabelgen version 3.6.0, and update MASTER_SITES and HOMEPAGE.

Changes include:
* --rows-columns=r,c will force all items to be fit in "c" columns, with
  each column having "r" lines (rows).
* Makefile: use INSTALL_FILE to install man page
* CD Label support - print directly on the CD or DVD
* --page-offset now accepts an optional X-axis offset also
  --page-offset [xoffset,]yoffset
* Fix cdinsert.pl CGI script to use PAPERSIZE option for A4 paper
* Slim Case now applies to DVD outside also - creates outside inserts
  for half-height DVD cases  - driven by these arguments:
  --create-dvd-outside --slim-case
* --slim-case to be used instead of --create-slim-cover (deprecated)
* End Cap text can now be rotated (flipped), --rotate-end-caps
* {#M} and {#MB} support directives added
  {#M} {#MB} {#BI} {#B} {#I} can appear in input text,  to make a line
  monospaced, monospaced-bold, bold-italic, bold, or italic respectively.
  Directives must appear in column 1 of line.
* Added dvdlogo.eps
* Changed aczone to aczoom
* DVD outside cover inserts now supported, --create-dvd-outside option
* Move down the DVD inside insert to fit better on letter and A4 paper
* trayimage "fill2" now fills all - cover, tray, spine, as appropriate
* Fixed bug in --outside-foldout and placement of tray image
* Fixed BoundingBox in divx.eps
* Date handling changed to use its own font size

5 files changed, 27 insertions, 25 deletions

diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile
index 0f691e04f02..aa79f40a953 100644
--- a/graphics/cdlabelgen/Makefile
+++ b/graphics/cdlabelgen/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:19 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/30 15:00:02 ben Exp $
 
-DISTNAME=	cdlabelgen-2.7.0
+DISTNAME=	cdlabelgen-3.6.0
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.aczone.com/pub/tools/
+MASTER_SITES=	http://www.aczoom.com/pub/tools/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	cube@NetBSD.org
-HOMEPAGE=	http://www.aczone.com/tools/cdinsert/
+HOMEPAGE=	http://www.aczoom.com/tools/cdinsert/
 COMMENT=	Generate frontcards and traycards for CDs
 
 USE_TOOLS+=	perl:run
diff --git a/graphics/cdlabelgen/PLIST b/graphics/cdlabelgen/PLIST
index cc7d10d6d7f..1aa01799ae9 100644
--- a/graphics/cdlabelgen/PLIST
+++ b/graphics/cdlabelgen/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2003/11/01 13:18:44 cube Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/12/30 15:00:02 ben Exp $
 bin/cdlabelgen
-man/cat1/cdlabelgen.0
+man/man1/cdlabelgen.1
 share/cdlabelgen/cd.eps
 share/cdlabelgen/cdda.eps
+share/cdlabelgen/dvdlogo.eps
 share/cdlabelgen/debian-color.eps
 share/cdlabelgen/divx.eps
 share/cdlabelgen/mp3.eps
diff --git a/graphics/cdlabelgen/distinfo b/graphics/cdlabelgen/distinfo
index 748ac12ae87..0dd9ebcab86 100644
--- a/graphics/cdlabelgen/distinfo
+++ b/graphics/cdlabelgen/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 08:45:03 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/12/30 15:00:02 ben Exp $
 
-SHA1 (cdlabelgen-2.7.0.tgz) = 318696fa8f2bfeb855ef5ceff2d57a99d5d4a17b
-RMD160 (cdlabelgen-2.7.0.tgz) = d7d86de318df00b62b86ab6b3a7e3bfee6d4cdeb
-Size (cdlabelgen-2.7.0.tgz) = 177711 bytes
-SHA1 (patch-aa) = 02f497ce19ab5f4839147523d006f4c4346f618a
-SHA1 (patch-ab) = abbf4ed9622cfe013b8d4b7188a01994b937002b
+SHA1 (cdlabelgen-3.6.0.tgz) = 5240b375dbd67cc422d7eeaa286b3c03c3ec5805
+RMD160 (cdlabelgen-3.6.0.tgz) = fdeb8367741adb18569227f7eed7f88cdcaf1d81
+Size (cdlabelgen-3.6.0.tgz) = 186151 bytes
+SHA1 (patch-aa) = 8a1dd2c83892d0316949e8a66b8d5fe67492a5de
+SHA1 (patch-ab) = a69203a2f212449ff0bb4e908ebc7f6632b95b04
diff --git a/graphics/cdlabelgen/patches/patch-aa b/graphics/cdlabelgen/patches/patch-aa
index 9d223179852..e57aa6f97f7 100644
--- a/graphics/cdlabelgen/patches/patch-aa
+++ b/graphics/cdlabelgen/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2003/03/23 02:02:34 rh Exp $
+$NetBSD: patch-aa,v 1.5 2005/12/30 15:00:02 ben Exp $
 
---- cdlabelgen.orig	2002-10-28 01:07:06.000000000 +1000
+--- cdlabelgen.orig	2005-08-23 08:22:44.000000000 -0700
 +++ cdlabelgen
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -w
@@ -8,7 +8,7 @@ $NetBSD: patch-aa,v 1.4 2003/03/23 02:02:34 rh Exp $
  #
  # cdlabelgen - a program for making cd jewel box covers and traycards
  #
-@@ -71,6 +71,7 @@ my @where_is_the_template;
+@@ -101,6 +101,7 @@ my @where_is_the_template;
  if ($^O !~ /^MSWin32/) { # not windows...
    # Unix section -----------------------------------------------------
    @where_is_the_template = (
diff --git a/graphics/cdlabelgen/patches/patch-ab b/graphics/cdlabelgen/patches/patch-ab
index 0fa82d312cd..67e38a49850 100644
--- a/graphics/cdlabelgen/patches/patch-ab
+++ b/graphics/cdlabelgen/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2003/08/03 20:44:29 jdolecek Exp $
+$NetBSD: patch-ab,v 1.7 2005/12/30 15:00:02 ben Exp $
 
---- Makefile.orig	2003-07-18 22:33:20.000000000 +0200
-+++ Makefile	2003-08-03 22:05:34.000000000 +0200
-@@ -8,11 +8,11 @@
+--- Makefile.orig	2005-08-23 08:22:44.000000000 -0700
++++ Makefile
+@@ -8,11 +8,11 @@ ZIPVERSION = 360
  # Change these to locations you need, also
  # remember to edit cdlabelgen and its @where_is_the_template as needed.
  
@@ -14,9 +14,9 @@ $NetBSD: patch-ab,v 1.6 2003/08/03 20:44:29 jdolecek Exp $
 -LIB_DIR   = $(BASE_DIR)/lib/cdlabelgen
 +LIB_DIR   = $(BASE_DIR)/share/cdlabelgen
  MAN_DIR   = $(BASE_DIR)/man
- SOURCES    = cdlabelgen ChangeLog INSTALL README Makefile cdinsert.pl INSTALL.WEB cdlabelgen.pod cdlabelgen.1 cdlabelgen.html spec.template
+ SOURCES    = cdlabelgen ChangeLog INSTALL README Makefile ../cdinsert.pl INSTALL.WEB cdlabelgen.pod cdlabelgen.1 cdlabelgen.html spec.template
  POSTSCRIPT = template.ps *.eps
-@@ -31,6 +31,14 @@
+@@ -31,6 +31,14 @@ INSTALL_FILE	:= install -m 0644
  # ---------------
  
  all: cdlabelgen.html cdlabelgen.1
@@ -31,17 +31,18 @@ $NetBSD: patch-ab,v 1.6 2003/08/03 20:44:29 jdolecek Exp $
  
  cdlabelgen.html: cdlabelgen.pod
  	pod2html --outfile=$@ --infile=$?
-@@ -43,13 +51,13 @@
+@@ -43,13 +51,13 @@ cdlabelgen.1: cdlabelgen.pod
  install: all
  	@echo "Installing cdlabelgen in $(BIN_DIR) and $(LIB_DIR)"
  	@echo ""
 -	$(INSTALL_DIR) $(BIN_DIR)
 -	$(INSTALL) cdlabelgen $(BIN_DIR)
--	$(INSTALL) cdlabelgen.1 $(MAN_DIR)/man1
+-	$(INSTALL_FILE) cdlabelgen.1 $(MAN_DIR)/man1
+-	$(INSTALL_DIR) $(LIB_DIR)
++
 +	${BSD_INSTALL_SCRIPT} cdlabelgen ${BIN_DIR}
++	${BSD_INSTALL_MAN} cdlabelgen.1 ${MAN_DIR}/man1
 +	${BSD_INSTALL_DATA_DIR} ${LIB_DIR}
-+	${BSD_INSTALL_MAN} cdlabelgen.0 ${MAN_DIR}/cat1/
- 	$(INSTALL_DIR) $(LIB_DIR)
  	set -e; \
  	for file in $(POSTSCRIPT); do \
 -		$(INSTALL_FILE) postscript/$$file $(LIB_DIR)/; \