Update cdlabelgen to latest version, 2.6.1

Changes:
* Word-wrap fix
* Included two logos for DivX and Ogg Vorbis
* Added option to output slim CD cover cases with page order switched
* Added --no-cover-plaque and --number-in-set <string>
* Updated spec file to match 2.6.1

3 files changed, 19 insertions, 18 deletions

diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile
index 80d713c7c88..e1e8cee8137 100644
--- a/graphics/cdlabelgen/Makefile
+++ b/graphics/cdlabelgen/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2003/07/21 16:51:38 martti Exp $
+# $NetBSD: Makefile,v 1.12 2003/08/03 20:44:28 jdolecek Exp $
 
-DISTNAME=	cdlabelgen-2.5.0
+DISTNAME=	cdlabelgen-2.6.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.aczone.com/pub/tools/
 EXTRACT_SUFX=	.tgz
@@ -15,4 +15,7 @@ USE_BUILDLINK2=	yes
 MAKE_ENV+=	SED="${SED}"
 MAKE_ENV+=	MV="${MV}"
 
+post-extract:
+	cd ${WRKSRC} && chmod go+r *
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cdlabelgen/distinfo b/graphics/cdlabelgen/distinfo
index 3de98a1bb46..ff37a9925d2 100644
--- a/graphics/cdlabelgen/distinfo
+++ b/graphics/cdlabelgen/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2003/03/23 02:02:34 rh Exp $
+$NetBSD: distinfo,v 1.8 2003/08/03 20:44:29 jdolecek Exp $
 
-SHA1 (cdlabelgen-2.5.0.tgz) = f259008107c353b4cc2d4110f8e6abe1a42e3560
-Size (cdlabelgen-2.5.0.tgz) = 131977 bytes
+SHA1 (cdlabelgen-2.6.1.tgz) = fa4b23e86ef3cf15774d7a67a14da2c19f87a17a
+Size (cdlabelgen-2.6.1.tgz) = 176433 bytes
 SHA1 (patch-aa) = 02f497ce19ab5f4839147523d006f4c4346f618a
-SHA1 (patch-ab) = 737bcdbaeb0078a4187efd284341015d037568fc
+SHA1 (patch-ab) = 0cd70e3edd497d76bd92f668d537711045f7bee0
diff --git a/graphics/cdlabelgen/patches/patch-ab b/graphics/cdlabelgen/patches/patch-ab
index 432c58cfa7a..0fa82d312cd 100644
--- a/graphics/cdlabelgen/patches/patch-ab
+++ b/graphics/cdlabelgen/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2003/03/23 02:02:34 rh Exp $
+$NetBSD: patch-ab,v 1.6 2003/08/03 20:44:29 jdolecek Exp $
 
---- Makefile.orig	2002-10-28 01:07:06.000000000 +1000
-+++ Makefile
-@@ -8,11 +8,11 @@ ZIPVERSION = 250
+--- Makefile.orig	2003-07-18 22:33:20.000000000 +0200
++++ Makefile	2003-08-03 22:05:34.000000000 +0200
+@@ -8,11 +8,11 @@
  # 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.5 2003/03/23 02:02:34 rh 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 cdlabelgen$(VERSION).spec
+ 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 @@ INSTALL_FILE	:= install -m 0644
+@@ -31,6 +31,14 @@
  # ---------------
  
  all: cdlabelgen.html cdlabelgen.1
@@ -27,27 +27,25 @@ $NetBSD: patch-ab,v 1.5 2003/03/23 02:02:34 rh Exp $
 +	else				\
 +		perldoc_flags="";	\
 +	fi;				\
-+	${LOCALBASE}/bin/perldoc $${perldoc_flags} cdlabelgen >cdlabelgen.0
++	${LOCALBASE}/bin/perldoc $$perldoc_flags cdlabelgen >cdlabelgen.0
  
  cdlabelgen.html: cdlabelgen.pod
  	pod2html --outfile=$@ --infile=$?
-@@ -43,15 +51,13 @@ cdlabelgen.1: cdlabelgen.pod
+@@ -43,13 +51,13 @@
  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_DIR) $(LIB_DIR)
 +	${BSD_INSTALL_SCRIPT} cdlabelgen ${BIN_DIR}
 +	${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)/; \
 +		${BSD_INSTALL_DATA} postscript/$$file ${LIB_DIR}; \
  	done
--	@echo "** Done. Check $(BIN_DIR)/cdlabelgen and fix @where_is_the_template - if needed!"
+ 	@echo "** Done. Check $(BIN_DIR)/cdlabelgen and fix @where_is_the_template - if needed!"
  
- dist: all
- 	rm -rf cdlabelgen$(VERSION)