Update cdlabelgen to 2.5.0. Changes include:

  cdlablegen:
  * added support for long options
  * added some options to choose different colors for plaque background,
    category, subcategory and text
  * added a man page
  * add /opt/lib/cdlabelgen/ to template search paths
  * added: -M option, to print out envelope for a CD
  * -v <very large number> is no longer an error, instead, all
    items are printed on cover, none on the tray card.
  * also added .spec file, from other sources on web, for RPM installs.
    Use:
    rpm -ta cdlabelgen-n.n.n.tgz
    to create RPM [not tested]
  * -v option to support splitting items array into items for cover,
    and items for tray
  * word wrap could result in 0 items, now ensures that #items >= 1
  * fixed bug where -f <file> containing one item only was being skipped;
    also added code to handle all kinds of end-of-line delimiters in the
    items file - each line is considered to be one item, so need to
    handle all kinds of EOLN characters.
  * -w word wrap was not working, now should work better in all cases
  * added -p option, pass to template.ps option to clip items
    instead of auto_reducing them to fit to a column
  * allow skipping either -c or -s option (or both)
  * minor change to insert \n in @items - keeps PostScript DSC
    compliant (as far as possible!) - line length should be < 255 chars
    done to keep warning messages away when using GSview

  template.ps:
  * added support for plaque background color, category text color,
    subcategory text color and text color
  * increased normal cd case insert dimensions very slightly for better
    fit
  * removed the ISOLatin1 recoding of fonts; added %%BeginProlog DSC
    comment - this allows piping output through the ogonkify program
    which can recode in a number of encodings. see man page for more
    information.
  * fill2 background should fill two endcaps only, do not fill the extreme
    right-hand tongue-cap, since the tongue-cap does not exist in normal
    cd inserts
  * added optional image translate arguments for -S and -T to
    offset cover/tray image as required
  * added -y: move entire printout up or down; ex: -y 1.5, for A4 paper size
  * added -l: control width of cover/tray edge lines, 0 skips printing
    edge lines entirely
  * support printing of CD envelopes, merged in envelope template sent
    by Ronald Rael Harvest <number6@cox.net>
  * added variables to control left/right margins for both cover and tray
  * both cover and tray can print list of items, uses two different
    arrays containing the items
  * add "fill2" option to fill image in tray and end-caps too
    in addition to just filling the interior of the tray card
  * -s <subban_string> would not print along the spine even when it would fit,
    Rewrote make_endcap function.
  * added larger bottom page offset - hopefully, will work on most
    printers using A4 size (Europe)
  * -p option now actually clips text (instead of just clipping
    graphically - used to leave partial letters on the printout)
    now full characters at the end of the string are omitted if needed
    to fit the column
  * major change to the font size and number of columns
    computation for list of items
    Added option to clip text instead of auto_reducing text to
    fit to column
  * images can be scaled to completely fill cover and tray card - so
    they can be used as background images.
  * added support directives {#BI} {#B} {#I}, appearing in input text,
    make a line bold-italic, or bold, or italic respectively.
    Directives must appear in column 1 of line.
  * bug fix: in n columns output,  if number of items was not a multiple

5 files changed, 71 insertions, 67 deletions

diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile
index 50527fb879b..312538bee87 100644
--- a/graphics/cdlabelgen/Makefile
+++ b/graphics/cdlabelgen/Makefile
@@ -1,14 +1,18 @@
-# $NetBSD: Makefile,v 1.7 2003/01/19 06:59:51 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/23 02:02:33 rh Exp $
 
-DISTNAME=		cdlabelgen-1.5.0
-CATEGORIES=		graphics
-MASTER_SITES=		http://www.red-bean.com/fitz/software/cdlabelgen/
+DISTNAME=	cdlabelgen-2.5.0
+CATEGORIES=	graphics
+MASTER_SITES=	http://www.aczone.com/pub/tools/
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.red-bean.com/~bwf/software/cdlabelgen/
-COMMENT=		generate frontcards and traycards for CDs
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.aczone.com/tools/cdinsert/
+COMMENT=	generate frontcards and traycards for CDs
 
-USE_PERL5=		YES
-MAKE_ENV+=		SED="${SED}" MV="${MV}"
+USE_PERL5=	run
+USE_BUILDLINK2=	yes
+
+MAKE_ENV+=	SED="${SED}"
+MAKE_ENV+=	MV="${MV}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cdlabelgen/PLIST b/graphics/cdlabelgen/PLIST
index 6c86223fb53..1cde661d056 100644
--- a/graphics/cdlabelgen/PLIST
+++ b/graphics/cdlabelgen/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:21 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/23 02:02:34 rh Exp $
 bin/cdlabelgen
 man/cat1/cdlabelgen.0
-share/cdlabelgen/template.ps
-share/cdlabelgen/recycle.ps
-share/cdlabelgen/recycle.epsi
-share/cdlabelgen/mp3.eps
-share/cdlabelgen/cdda.eps
 share/cdlabelgen/cd.eps
-share/cdlabelgen/penguin.eps
+share/cdlabelgen/cdda.eps
 share/cdlabelgen/debian-color.eps
-share/cdlabelgen/debian-bw.eps
+share/cdlabelgen/mp3.eps
+share/cdlabelgen/music1.eps
+share/cdlabelgen/music2.eps
+share/cdlabelgen/penguin.eps
+share/cdlabelgen/recycle.eps
+share/cdlabelgen/template.ps
 @dirrm share/cdlabelgen
diff --git a/graphics/cdlabelgen/distinfo b/graphics/cdlabelgen/distinfo
index a9534834d9d..3de98a1bb46 100644
--- a/graphics/cdlabelgen/distinfo
+++ b/graphics/cdlabelgen/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2003/01/19 06:59:51 salo Exp $
+$NetBSD: distinfo,v 1.7 2003/03/23 02:02:34 rh Exp $
 
-SHA1 (cdlabelgen-1.5.0.tar.gz) = 5fba7a67b3f4c86cd879fa9dc231501c77ac8374
-Size (cdlabelgen-1.5.0.tar.gz) = 88979 bytes
-SHA1 (patch-aa) = f33817230b73212c31735f21596aa99a0f138400
-SHA1 (patch-ab) = caf7182b6fe9ad9790ebb1e90391bcc03062cf95
+SHA1 (cdlabelgen-2.5.0.tgz) = f259008107c353b4cc2d4110f8e6abe1a42e3560
+Size (cdlabelgen-2.5.0.tgz) = 131977 bytes
+SHA1 (patch-aa) = 02f497ce19ab5f4839147523d006f4c4346f618a
+SHA1 (patch-ab) = 737bcdbaeb0078a4187efd284341015d037568fc
diff --git a/graphics/cdlabelgen/patches/patch-aa b/graphics/cdlabelgen/patches/patch-aa
index f721d4dea56..9d223179852 100644
--- a/graphics/cdlabelgen/patches/patch-aa
+++ b/graphics/cdlabelgen/patches/patch-aa
@@ -1,20 +1,18 @@
-$NetBSD: patch-aa,v 1.3 1999/08/08 01:26:52 mjl Exp $
+$NetBSD: patch-aa,v 1.4 2003/03/23 02:02:34 rh Exp $
 
---- cdlabelgen.orig	Sun Aug  8 02:31:39 1999
-+++ cdlabelgen	Sun Aug  8 02:33:28 1999
+--- cdlabelgen.orig	2002-10-28 01:07:06.000000000 +1000
++++ cdlabelgen
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -w
 +#!@PREFIX@/bin/perl -w
  #
  # cdlabelgen - a program for making cd jewel box covers and traycards
  #
-@@ -35,7 +35,8 @@
- 
- # Modify this if you want to store your template somewhere else
- # Perhaps we can make this part of a conf file in the future?
--my @where_is_the_template = ('/usr/share/cdlabelgen/',
-+my @where_is_the_template = ('@PREFIX@/share/cdlabelgen/',
-+                             '/usr/share/cdlabelgen/',
- 									  '/usr/local/share/cdlabelgen/',
- 									  '/usr/local/lib/cdlabelgen/',
- 									  '/etc/cdlabelgen/',
+@@ -71,6 +71,7 @@ my @where_is_the_template;
+ if ($^O !~ /^MSWin32/) { # not windows...
+   # Unix section -----------------------------------------------------
+   @where_is_the_template = (
++    '@PREFIX@/share/cdlabelgen/',
+     '/usr/local/lib/cdlabelgen/',
+     '/usr/share/cdlabelgen/',
+     '/opt/lib/cdlabelgen/',
diff --git a/graphics/cdlabelgen/patches/patch-ab b/graphics/cdlabelgen/patches/patch-ab
index f17a32242dc..432c58cfa7a 100644
--- a/graphics/cdlabelgen/patches/patch-ab
+++ b/graphics/cdlabelgen/patches/patch-ab
@@ -1,25 +1,25 @@
-$NetBSD: patch-ab,v 1.4 2003/01/19 06:59:52 salo Exp $
+$NetBSD: patch-ab,v 1.5 2003/03/23 02:02:34 rh Exp $
 
---- Makefile.orig	Sun Jul  4 18:44:37 1999
-+++ Makefile	Fri Sep  1 16:34:47 2000
-@@ -4,31 +4,34 @@
- 
- # Where you want cdlabelgen and related files to be
+--- Makefile.orig	2002-10-28 01:07:06.000000000 +1000
++++ Makefile
+@@ -8,11 +8,11 @@ ZIPVERSION = 250
+ # 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   = ${PREFIX}
- TEMPLATE   = ./postscript/template.ps
- SOURCES    = cdlabelgen ChangeLog COPYING INSTALL README Makefile
- POSTSCRIPT = template.ps recycle.ps recycle.epsi mp3.eps cdda.eps     \
- 				 cd.eps penguin.eps debian-color.eps debian-bw.eps
- DISTFILES = $(SOURCES) $(POSTSCRIPT)
+ # BASE_DIR   = /usr/local
+ # BASE_DIR   = /opt
+ BIN_DIR   = $(BASE_DIR)/bin
+-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 cdlabelgen$(VERSION).spec
+ POSTSCRIPT = template.ps *.eps
+@@ -31,6 +31,14 @@ INSTALL_FILE	:= install -m 0644
+ # ---------------
  
--# just use 'cp -a' if you don't have install...
--INSTALL		:= install -m 0755
--INSTALL_DIR	:= install -d -m 0755
--INSTALL_FILE	:= install -m 0644
--
- all: cdlabelgen
+ all: cdlabelgen.html cdlabelgen.1
 +	${SED} s=@PREFIX@=${PREFIX}=g <cdlabelgen >cdlabelgen.new
 +	${MV} cdlabelgen.new cdlabelgen
 +	if [ `id -u` -eq 0 ]; then	\
@@ -29,23 +29,25 @@ $NetBSD: patch-ab,v 1.4 2003/01/19 06:59:52 salo Exp $
 +	fi;				\
 +	${LOCALBASE}/bin/perldoc $${perldoc_flags} cdlabelgen >cdlabelgen.0
  
- ###
- install: 
--	@echo "Installing cdlabelgen under $(BASE_DIR)"
-+	@echo "Installing cdlabelgen under ${BASE_DIR}"
+ cdlabelgen.html: cdlabelgen.pod
+ 	pod2html --outfile=$@ --infile=$?
+@@ -43,15 +51,13 @@ cdlabelgen.1: cdlabelgen.pod
+ install: all
+ 	@echo "Installing cdlabelgen in $(BIN_DIR) and $(LIB_DIR)"
  	@echo ""
--	$(INSTALL_DIR) $(BASE_DIR)/bin
--	$(INSTALL) cdlabelgen $(BASE_DIR)/bin
--	$(INSTALL_DIR) $(BASE_DIR)/share/cdlabelgen
--	$(INSTALL_FILE) $(TEMPLATE) $(BASE_DIR)/share/cdlabelgen
-+	${BSD_INSTALL_SCRIPT} cdlabelgen ${BASE_DIR}/bin/cdlabelgen
-+	${BSD_INSTALL_DATA_DIR} ${BASE_DIR}/share/cdlabelgen
-+	${BSD_INSTALL_DATA} $(TEMPLATE) ${BASE_DIR}/share/cdlabelgen/
-+	${BSD_INSTALL_MAN} cdlabelgen.0 ${BASE_DIR}/man/cat1/
+-	$(INSTALL_DIR) $(BIN_DIR)
+-	$(INSTALL) cdlabelgen $(BIN_DIR)
+-	$(INSTALL) cdlabelgen.1 $(MAN_DIR)/man1
+-	$(INSTALL_DIR) $(LIB_DIR)
++	${BSD_INSTALL_SCRIPT} cdlabelgen ${BIN_DIR}
++	${BSD_INSTALL_DATA_DIR} ${LIB_DIR}
++	${BSD_INSTALL_MAN} cdlabelgen.0 ${MAN_DIR}/cat1/
  	set -e; \
  	for file in $(POSTSCRIPT); do \
--		$(INSTALL_FILE) postscript/$$file $(BASE_DIR)/share/cdlabelgen/; \
-+		${BSD_INSTALL_DATA} postscript/$$file ${BASE_DIR}/share/cdlabelgen/; \
+-		$(INSTALL_FILE) postscript/$$file $(LIB_DIR)/; \
++		${BSD_INSTALL_DATA} postscript/$$file ${LIB_DIR}; \
  	done
+-	@echo "** Done. Check $(BIN_DIR)/cdlabelgen and fix @where_is_the_template - if needed!"
  
- dist: 
+ dist: all
+ 	rm -rf cdlabelgen$(VERSION)