From eps@anna.ana.com  Mon Mar 19 06:21:57 2007
Return-Path: <eps@anna.ana.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0695F16A401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Mar 2007 06:21:57 +0000 (UTC)
	(envelope-from eps@anna.ana.com)
Received: from anna.ana.com (anna.ana.com [208.69.41.33])
	by mx1.freebsd.org (Postfix) with ESMTP id BB44613C469
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Mar 2007 06:21:56 +0000 (UTC)
	(envelope-from eps@anna.ana.com)
Received: from anna.ana.com (localhost [127.0.0.1])
	by anna.ana.com (8.13.8/8.13.8) with ESMTP id l2J6Kg6a012678
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 18 Mar 2007 23:20:43 -0700 (PDT)
Received: (from eps@localhost)
	by anna.ana.com (8.13.8/8.13.8/Submit) id l2J6KfDP012672;
	Sun, 18 Mar 2007 23:20:41 -0700 (PDT)
Message-Id: <200703190620.l2J6KfDP012672@anna.ana.com>
Date: Sun, 18 Mar 2007 23:20:41 -0700 (PDT)
From: "Eric P. Scott" <eps+pbug0703@ana.com>
Reply-To: "Eric P. Scott" <eps+pbug0703@ana.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: sysutils/isomaster: upgrade to 0.8.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         110501
>Category:       ports
>Synopsis:       sysutils/isomaster: upgrade to 0.8.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 19 06:30:02 GMT 2007
>Closed-Date:    Wed Mar 21 09:59:15 GMT 2007
>Last-Modified:  Wed Mar 21 10:01:00 GMT 2007
>Originator:     Eric P. Scott
>Release:        FreeBSD 6.2-RELEASE-p2 i386
>Organization:
ana-systems, Inc.
>Environment:
System: FreeBSD sixofone 6.2-RELEASE-p2 FreeBSD 6.2-RELEASE-p2 #0: Tue Feb 27 22:41:06 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Upgrade to release 0.8.1
N.B. Entire contents of files/ removed
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/sysutils/isomaster/Makefile sysutils/isomaster/Makefile
--- /usr/ports/sysutils/isomaster/Makefile	Fri Mar  9 03:14:25 2007
+++ sysutils/isomaster/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	isomaster
-PORTVERSION=	0.7.1
+PORTVERSION=	0.8.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://littlesvr.ca/isomaster/releases/
 
@@ -17,24 +17,35 @@
 USE_GNOME=	gtk20 pkgconfig intlhack gnomehier
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-INSTALLS_ICON=	yes
 
-MAKE_ENV=	PREFIX=${PREFIX}
+MAKE_ENV=	PREFIX=${PREFIX} DESKTOPPATH=${DESKTOPDIR}
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
 CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS:S/"//g} \
 		`pkg-config --cflags gtk+-2.0` \
 		-DICONPATH=\\\"${DATADIR}/icons\\\"
 .if !defined(WITHOUT_NLS)
-CFLAGS+=	-DLOCALEDIR=\\\"${PREFIX}/share/locale\\\"
+CFLAGS+=	-DLOCALEDIR=\\\"${PREFIX}/share/locale\\\" -DENABLE_NLS
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
+PLIST_SUB+=	DESKTOPDIR="${DESKTOPDIR:S,^${TARGETDIR}/,,}"
 
-post-install:
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${FILESDIR}/isomaster.desktop ${PREFIX}/share/applications
-	${MKDIR} ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/icons/isomaster.png ${PREFIX}/share/pixmaps/isomaster.png
+MAN1=	isomaster.1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/isomaster ${PREFIX}/bin
+	${MKDIR} ${DATADIR}/icons
+.for i in isomaster.png go-back-kearone.png folder-new-kearone.png add2-kearone.png extract2-kearone.png delete-kearone.png
+	${INSTALL_DATA} ${WRKSRC}/icons/${i} ${DATADIR}/icons
+.endfor
+.if !defined(WITHOUT_NLS)
+.for i in bg de es fr it nl pl pt ro ru sk sq zh_CN zh_TW
+	${INSTALL_DATA} ${WRKSRC}/po/${i}.mo ${PREFIX}/share/locale/${i}/LC_MESSAGES/isomaster.mo
+.endfor
+.endif
+	${INSTALL_MAN} ${WRKSRC}/isomaster.1 ${MAN1PREFIX}/man/man1
+	${MKDIR} ${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/isomaster.desktop ${DESKTOPDIR}
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/sysutils/isomaster/distinfo sysutils/isomaster/distinfo
--- /usr/ports/sysutils/isomaster/distinfo	Fri Mar  9 03:14:25 2007
+++ sysutils/isomaster/distinfo	Sun Mar 18 08:40:25 2007
@@ -1,3 +1,3 @@
-MD5 (isomaster-0.7.1.tar.bz2) = abc8b7bcd415084ace00854cca6248f0
-SHA256 (isomaster-0.7.1.tar.bz2) = 4caeb25be0a5d4cd18028469387fce5e15009304296c162b238f199b66f1c78a
-SIZE (isomaster-0.7.1.tar.bz2) = 161217
+MD5 (isomaster-0.8.1.tar.bz2) = 32066d9358f7f2601c3dc5344687f572
+SHA256 (isomaster-0.8.1.tar.bz2) = 19647b3b9bf798b82793b81aad22e5824ec13418a5fb429bdd8c70f67a9a9e21
+SIZE (isomaster-0.8.1.tar.bz2) = 205535
diff -ruN /usr/ports/sysutils/isomaster/files/isomaster.desktop sysutils/isomaster/files/isomaster.desktop
--- /usr/ports/sysutils/isomaster/files/isomaster.desktop	Sat Dec 16 01:45:54 2006
+++ sysutils/isomaster/files/isomaster.desktop	Wed Dec 31 16:00:00 1969
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=ISO Master
-Type=Application
-Exec=isomaster
-Icon=isomaster.png
-GenericName=CD image editor
-Comment=CD image editor
-Terminal=false
-MimeType=application/x-iso;
-X-KDE-StartupNotify=true
-Categories=Application;AudioVideo;DiscBurning;
diff -ruN /usr/ports/sysutils/isomaster/files/patch-Makefile sysutils/isomaster/files/patch-Makefile
--- /usr/ports/sysutils/isomaster/files/patch-Makefile	Fri Mar  9 03:14:26 2007
+++ sysutils/isomaster/files/patch-Makefile	Wed Dec 31 16:00:00 1969
@@ -1,30 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -47,7 +47,7 @@
- 
- OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o
- 
--all: lib iniparser translations isomaster man
-+all: lib iniparser translations isomaster
- 
- isomaster: $(OBJECTS) bk/bk.a iniparser-2.15/libiniparser.a
- 	$(CC) $(OBJECTS) bk/bk.a iniparser-2.15/libiniparser.a $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0`-o isomaster
-@@ -91,15 +91,15 @@
- ifndef WITHOUT_NLS
- 	cd po && $(MAKE) install
- endif
--	$(INSTALL) -d $(DESTDIR)$(MYMANPATH)
--	$(INSTALL) -m 644 isomaster.1.gz $(DESTDIR)$(MYMANPATH)
-+#	$(INSTALL) -d $(DESTDIR)$(MYMANPATH)
-+#	$(INSTALL) -m 644 isomaster.1 $(DESTDIR)$(MYMANPATH)
- 
- uninstall: 
- 	$(RM) $(DESTDIR)$(BINPATH)/isomaster
- 	$(RM) $(DESTDIR)$(ICONPATH)/isomaster.png
- 	$(RM) $(DESTDIR)$(ICONPATH)/folder-new-tango.png
- 	$(RM) $(DESTDIR)$(ICONPATH)/add2-kearone.png
--	$(RM) $(DESTDIR)$(ICONPATH)/extract-kearone.png
-+	$(RM) $(DESTDIR)$(ICONPATH)/extract2-kearone.png
- ifndef WITHOUT_NLS
- 	cd po && $(MAKE) uninstall
- endif
diff -ruN /usr/ports/sysutils/isomaster/pkg-plist sysutils/isomaster/pkg-plist
--- /usr/ports/sysutils/isomaster/pkg-plist	Thu Jan 18 00:19:43 2007
+++ sysutils/isomaster/pkg-plist
@@ -1,18 +1,25 @@
 bin/isomaster
-share/applications/isomaster.desktop
+%%DESKTOPDIR%%/isomaster.desktop
 %%DATADIR%%/icons/add2-kearone.png
+%%DATADIR%%/icons/delete-kearone.png
 %%DATADIR%%/icons/extract2-kearone.png
-%%DATADIR%%/icons/folder-new-tango.png
+%%DATADIR%%/icons/folder-new-kearone.png
+%%DATADIR%%/icons/go-back-kearone.png
 %%DATADIR%%/icons/isomaster.png
 %%NLS%%share/locale/bg/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/de/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/es/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/it/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/isomaster.mo
-share/pixmaps/isomaster.png
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
+@dirrmtry %%DESKTOPDIR%%
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->farrokhi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Mar 19 06:30:14 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110501 
Responsible-Changed-From-To: farrokhi->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon Mar 19 08:12:11 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110501 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Wed Mar 21 09:59:13 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110501 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110501: commit references a PR
Date: Wed, 21 Mar 2007 09:59:54 +0000 (UTC)

 miwi        2007-03-21 09:59:17 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/isomaster   Makefile distinfo pkg-plist 
   Removed files:
     sysutils/isomaster/files isomaster.desktop patch-Makefile 
   Log:
   - Update to 8.1
   
   PR:             110501
   Submitted by:   Eric P. Scott <eps+pbug0703@ana.com>
   Approved by:    maintainer implicit
   
   Revision  Changes    Path
   1.5       +20 -9     ports/sysutils/isomaster/Makefile
   1.4       +3 -3      ports/sysutils/isomaster/distinfo
   1.2       +0 -13     ports/sysutils/isomaster/files/isomaster.desktop (dead)
   1.4       +0 -30     ports/sysutils/isomaster/files/patch-Makefile (dead)
   1.4       +12 -5     ports/sysutils/isomaster/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
