From nox@saturn.kn-bremen.de  Tue Feb 15 19:18:29 2005
Return-Path: <nox@saturn.kn-bremen.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9415316A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 15 Feb 2005 19:18:29 +0000 (GMT)
Received: from gwyn.kn-bremen.de (gwyn.kn-bremen.de [212.63.36.242])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7152F43D55
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 15 Feb 2005 19:18:27 +0000 (GMT)
	(envelope-from nox@saturn.kn-bremen.de)
Received: from gwyn.kn-bremen.de (uucp@gwyn [127.0.0.1])
	by gwyn.kn-bremen.de (8.12.9/8.12.9/Debian-5) with ESMTP id j1FJIQO4023140
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 15 Feb 2005 20:18:26 +0100
Received: from saturn.kn-bremen.de (uucp@localhost)
	by gwyn.kn-bremen.de (8.12.9/8.12.8/Debian-1) with UUCP id j1FJIQoQ023138
	for FreeBSD-gnats-submit@freebsd.org; Tue, 15 Feb 2005 20:18:26 +0100
Received: (from nox@localhost)
	by saturn.kn-bremen.de (8.11.4/8.8.5) id j1FJEU820819;
	Tue, 15 Feb 2005 20:14:30 +0100 (CET)
Message-Id: <200502151914.j1FJEU820819@saturn.kn-bremen.de>
Date: Tue, 15 Feb 2005 20:14:30 +0100 (CET)
From: Juergen Lock <nox@jelal.kn-bremen.de>
Reply-To: Juergen Lock <nox@jelal.kn-bremen.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update print/cdlabelgen to 3.5.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         77569
>Category:       ports
>Synopsis:       update print/cdlabelgen to 3.5.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 15 19:20:13 GMT 2005
>Closed-Date:    Thu Feb 24 09:56:08 GMT 2005
>Last-Modified:  Thu Feb 24 09:56:08 GMT 2005
>Originator:     Juergen Lock
>Release:        FreeBSD 5.3-RELEASE-p2 i386
>Organization:
me?  organized??
>Environment:
System: FreeBSD saturn 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #4: Fri Dec 31 16:22:36 CET 2004     nox@neptun:/ad0/usr/home/nox/src5/usr/src/sys/i386/compile/NEPTUN  i386


	
>Description:

	new version, MASTER_SITES and WWW moved

>How-To-Repeat:

	n/a

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/print/cdlabelgen/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	4 Dec 2003 14:13:03 -0000	1.8
+++ Makefile	15 Feb 2005 18:59:24 -0000
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	cdlabelgen
-PORTVERSION=	2.7.0
+PORTVERSION=	3.5.0
 CATEGORIES=	print perl5
-MASTER_SITES=	http://www.aczone.com/pub/tools/
+MASTER_SITES=	http://www.aczoom.com/pub/tools/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nox@jelal.kn-bremen.de
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/print/cdlabelgen/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	31 Mar 2004 03:10:44 -0000	1.4
+++ distinfo	15 Feb 2005 19:08:16 -0000
@@ -1,2 +1,2 @@
-MD5 (cdlabelgen-2.7.0.tgz) = 098575f2635358f15b3f6dbef1b851df
-SIZE (cdlabelgen-2.7.0.tgz) = 177711
+MD5 (cdlabelgen-3.5.0.tgz) = bbe82a25e9eeb66df54ca8f61d561f59
+SIZE (cdlabelgen-3.5.0.tgz) = 184880
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/print/cdlabelgen/pkg-descr,v
retrieving revision 1.3
diff -u -r1.3 pkg-descr
--- pkg-descr	4 Dec 2003 14:13:03 -0000	1.3
+++ pkg-descr	15 Feb 2005 19:05:54 -0000
@@ -20,4 +20,4 @@
 
 (from the manual, see cdlabelgen(1) for the full one)
 
-WWW: http://www.aczone.com/tools/cdinsert/
+WWW: http://www.aczoom.com/tools/cdinsert/
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/print/cdlabelgen/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	4 Dec 2003 14:13:03 -0000	1.3
+++ pkg-plist	15 Feb 2005 19:07:15 -0000
@@ -3,6 +3,7 @@
 share/cdlabelgen/cdda.eps
 share/cdlabelgen/debian-color.eps
 share/cdlabelgen/divx.eps
+share/cdlabelgen/dvdlogo.eps
 share/cdlabelgen/mp3.eps
 share/cdlabelgen/music1.eps
 share/cdlabelgen/music2.eps
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/print/cdlabelgen/files/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- files/patch-aa	4 Dec 2003 14:13:03 -0000	1.3
+++ files/patch-aa	15 Feb 2005 19:02:29 -0000
@@ -1,6 +1,5 @@
---- Makefile	Thu Aug 21 20:53:19 2003
-+++ Makefile	Thu Aug 21 20:56:07 2003
-@@ -8,21 +8,15 @@
+Index: Makefile
+@@ -8,20 +8,19 @@
  # Change these to locations you need, also
  # remember to edit cdlabelgen and its @where_is_the_template as needed.
  
@@ -11,19 +10,21 @@
 -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
  DISTFILES = $(SOURCES) $(POSTSCRIPT)
  
--# just use 'cp -a' if you don't have install...
+ # 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
--
++#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 @@
+@@ -45,7 +44,7 @@
  	@echo ""
  	$(INSTALL_DIR) $(BIN_DIR)
  	$(INSTALL) cdlabelgen $(BIN_DIR)
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: vs 
State-Changed-When: Wed Feb 16 15:04:18 GMT 2005 
State-Changed-Why:  
How about the following? This minimizes the patch a bit: 

Index: Makefile 
=================================================================== 
RCS file: /usr/freebsdcvs/cvs-ports/ports/print/cdlabelgen/Makefile,v 
retrieving revision 1.8 
diff -u -r1.8 Makefile 
--- Makefile	4 Dec 2003 14:13:03 -0000	1.8 
+++ Makefile	16 Feb 2005 15:02:28 -0000 
@@ -6,9 +6,9 @@ 
# 

PORTNAME=	cdlabelgen 
-PORTVERSION=	2.7.0 
+PORTVERSION=	3.5.0 
CATEGORIES=	print perl5 
-MASTER_SITES=	http://www.aczone.com/pub/tools/ 
+MASTER_SITES=	http://www.aczoom.com/pub/tools/ 
EXTRACT_SUFX=	.tgz 

MAINTAINER=	nox@jelal.kn-bremen.de 
@@ -18,7 +18,8 @@ 
MANCOMPRESSED=	no 

USE_PERL5=	yes 
-MAKE_ENV=	BASE_DIR="${PREFIX}"  
+MAKE_ARGS=	BASE_DIR="${PREFIX}"  
+		LIB_DIR="${DATADIR}"  
INSTALL="${INSTALL_SCRIPT}"  
INSTALL_DIR="${MKDIR}"  
INSTALL_FILE="${INSTALL_DATA}"  
Index: distinfo 
=================================================================== 
RCS file: /usr/freebsdcvs/cvs-ports/ports/print/cdlabelgen/distinfo,v 
retrieving revision 1.4 
diff -u -r1.4 distinfo 
--- distinfo	31 Mar 2004 03:10:44 -0000	1.4 
+++ distinfo	16 Feb 2005 14:55:46 -0000 
@@ -1,2 +1,2 @@ 
-MD5 (cdlabelgen-2.7.0.tgz) = 098575f2635358f15b3f6dbef1b851df 
-SIZE (cdlabelgen-2.7.0.tgz) = 177711 
+MD5 (cdlabelgen-3.5.0.tgz) = bbe82a25e9eeb66df54ca8f61d561f59 
+SIZE (cdlabelgen-3.5.0.tgz) = 184880 
Index: pkg-descr 
=================================================================== 
RCS file: /usr/freebsdcvs/cvs-ports/ports/print/cdlabelgen/pkg-descr,v 
retrieving revision 1.3 
diff -u -r1.3 pkg-descr 
--- pkg-descr	4 Dec 2003 14:13:03 -0000	1.3 
+++ pkg-descr	16 Feb 2005 14:55:46 -0000 
@@ -20,4 +20,4 @@ 

(from the manual, see cdlabelgen(1) for the full one) 

-WWW: http://www.aczone.com/tools/cdinsert/ 
+WWW: http://www.aczoom.com/tools/cdinsert/ 
Index: pkg-plist 
=================================================================== 
RCS file: /usr/freebsdcvs/cvs-ports/ports/print/cdlabelgen/pkg-plist,v 
retrieving revision 1.3 
diff -u -r1.3 pkg-plist 
--- pkg-plist	4 Dec 2003 14:13:03 -0000	1.3 
+++ pkg-plist	16 Feb 2005 14:55:46 -0000 
@@ -3,6 +3,7 @@ 
share/cdlabelgen/cdda.eps 
share/cdlabelgen/debian-color.eps 
share/cdlabelgen/divx.eps 
+share/cdlabelgen/dvdlogo.eps 
share/cdlabelgen/mp3.eps 
share/cdlabelgen/music1.eps 
share/cdlabelgen/music2.eps 
Index: files/patch-aa 
=================================================================== 
RCS file: /usr/freebsdcvs/cvs-ports/ports/print/cdlabelgen/files/patch-aa,v 
retrieving revision 1.3 
diff -u -r1.3 patch-aa 
--- files/patch-aa	4 Dec 2003 14:13:03 -0000	1.3 
+++ files/patch-aa	16 Feb 2005 15:02:04 -0000 
@@ -1,28 +1,5 @@ 
--- 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 
- # 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) 


Responsible-Changed-From-To: freebsd-ports-bugs->vs 
Responsible-Changed-By: vs 
Responsible-Changed-When: Wed Feb 16 15:04:18 GMT 2005 
Responsible-Changed-Why:  
Handle 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77569 
State-Changed-From-To: feedback->closed 
State-Changed-By: vs 
State-Changed-When: Thu Feb 24 09:55:58 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77569 
>Unformatted:
