Update to 2.7.0

PR:             56755
Submitted by:   Juha Erkkila <erkkila@cc.jyu.fi>
Approved by:    maintainer

5 files changed, 51 insertions, 25 deletions

diff --git a/print/cdlabelgen/Makefile b/print/cdlabelgen/Makefile
index f3451dc939cf..b3a3392265be 100644
--- a/print/cdlabelgen/Makefile
+++ b/print/cdlabelgen/Makefile
@@ -6,15 +6,23 @@
 #
 
 PORTNAME=	cdlabelgen
-PORTVERSION=	1.5.0
-CATEGORIES=	print
-MASTER_SITES=	http://www.red-bean.com/fitz/software/cdlabelgen/
+PORTVERSION=	2.7.0
+CATEGORIES=	print perl5
+MASTER_SITES=	http://www.aczone.com/pub/tools/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nox@jelal.kn-bremen.de
 COMMENT=	Generate postscript for frontcards and traycards for CDs
 
+MAN1=		cdlabelgen.1
+MANCOMPRESSED=	no
+
 USE_PERL5=	yes
-MAKE_ENV=	BASE_DIR=${PREFIX}
+MAKE_ENV=	BASE_DIR="${PREFIX}" \
+		INSTALL="${INSTALL_SCRIPT}" \
+		INSTALL_DIR="${MKDIR}" \
+		INSTALL_FILE="${INSTALL_DATA}" \
+		INSTALL_MAN="${INSTALL_MAN}"
 
 do-build:
 	${PERL5} -i.bak -p -e "if (1 .. 1) {s-^#!/usr/bin/perl-#!${PERL}-;}" ${WRKSRC}/cdlabelgen
diff --git a/print/cdlabelgen/distinfo b/print/cdlabelgen/distinfo
index cc070faef512..9c26bf93dd79 100644
--- a/print/cdlabelgen/distinfo
+++ b/print/cdlabelgen/distinfo
@@ -1 +1 @@
-MD5 (cdlabelgen-1.5.0.tar.gz) = 3ed7968301825d658d470de5f00812aa
+MD5 (cdlabelgen-2.7.0.tgz) = 098575f2635358f15b3f6dbef1b851df
diff --git a/print/cdlabelgen/files/patch-aa b/print/cdlabelgen/files/patch-aa
index ed6b3c1e777d..276da1c6bf0f 100644
--- a/print/cdlabelgen/files/patch-aa
+++ b/print/cdlabelgen/files/patch-aa
@@ -1,19 +1,34 @@
---- Makefile.orig	Wed Aug 25 14:09:47 1999
-+++ Makefile	Wed Aug 25 14:10:01 1999
-@@ -4,7 +4,7 @@
- 
- # Where you want cdlabelgen and related files to be
+--- Makefile	Thu Aug 21 20:53:19 2003
++++ Makefile	Thu Aug 21 20:56:07 2003
+@@ -8,21 +8,15 @@
+ # 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/local
- TEMPLATE   = ./postscript/template.ps
- SOURCES    = cdlabelgen ChangeLog COPYING INSTALL README Makefile
- POSTSCRIPT = template.ps recycle.ps recycle.epsi mp3.eps cdda.eps     \
-@@ -25,7 +25,6 @@
- 	$(INSTALL_DIR) $(BASE_DIR)/bin
- 	$(INSTALL) cdlabelgen $(BASE_DIR)/bin
- 	$(INSTALL_DIR) $(BASE_DIR)/share/cdlabelgen
--	$(INSTALL_FILE) $(TEMPLATE) $(BASE_DIR)/share/cdlabelgen
+ # 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 spec.template
+ POSTSCRIPT = template.ps *.eps
+ DISTFILES = $(SOURCES) $(POSTSCRIPT)
+ 
+-# 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
+-
+ # Makefile macros....
+ #1.  $@ is the name of the file to be made.
+ #2.  $? is the names of the changed dependents. 
+@@ -45,7 +39,7 @@
+ 	@echo ""
+ 	$(INSTALL_DIR) $(BIN_DIR)
+ 	$(INSTALL) cdlabelgen $(BIN_DIR)
+-	$(INSTALL) cdlabelgen.1 $(MAN_DIR)/man1
++	$(INSTALL_MAN) cdlabelgen.1 $(MAN_DIR)/man1
+ 	$(INSTALL_DIR) $(LIB_DIR)
  	set -e; \
  	for file in $(POSTSCRIPT); do \
- 		$(INSTALL_FILE) postscript/$$file $(BASE_DIR)/share/cdlabelgen/; \
diff --git a/print/cdlabelgen/pkg-descr b/print/cdlabelgen/pkg-descr
index b6714bdd9656..2e198ca90997 100644
--- a/print/cdlabelgen/pkg-descr
+++ b/print/cdlabelgen/pkg-descr
@@ -18,6 +18,6 @@ cdlabelgen's purpose in life is twofold:
        cdlabelgen does not actually print anything--it just spits
        out postscript, which you can then do with as you please.
 
-(from the manual, type `perldoc cdlabelgen' to get the full one)
+(from the manual, see cdlabelgen(1) for the full one)
 
-WWW: http://www.red-bean.com/fitz/software-cdlabelgen.shtml
+WWW: http://www.aczone.com/tools/cdinsert/
diff --git a/print/cdlabelgen/pkg-plist b/print/cdlabelgen/pkg-plist
index 76c7f50edf26..e3cc8d75c918 100644
--- a/print/cdlabelgen/pkg-plist
+++ b/print/cdlabelgen/pkg-plist
@@ -1,11 +1,14 @@
 bin/cdlabelgen
 share/cdlabelgen/cd.eps
 share/cdlabelgen/cdda.eps
-share/cdlabelgen/debian-bw.eps
 share/cdlabelgen/debian-color.eps
+share/cdlabelgen/divx.eps
 share/cdlabelgen/mp3.eps
+share/cdlabelgen/music1.eps
+share/cdlabelgen/music2.eps
+share/cdlabelgen/ogg.eps
 share/cdlabelgen/penguin.eps
-share/cdlabelgen/recycle.epsi
-share/cdlabelgen/recycle.ps
+share/cdlabelgen/recycle.eps
 share/cdlabelgen/template.ps
+share/cdlabelgen/winamp.eps
 @dirrm share/cdlabelgen