ports/61880: [MAINTAINER UPDATE] audio/prokyon3: fix build on stable and update to 0.9.2

Kay Lehmann kay_lehmann at web.de
Sun Jan 25 13:20:25 UTC 2004


>Number:         61880
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] audio/prokyon3: fix build on stable and update to 0.9.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 25 05:20:15 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Kay Lehmann
>Release:        FreeBSD 5.2-RELEASE i386
>Organization:
>Environment:


System: FreeBSD bippes.finkenkrug.ev 5.2-RELEASE FreeBSD 5.2-RELEASE #12: Mon Jan 12 23:16:09 CET 2004     kay at bippes.finkenkrug.ev:/usr/obj/usr/src/sys/bippes i386


>Description:


Update to version 0.9.2 and fix build on stable (needs USE_GETOPT_LONG).
This port introduces rudimental burning support. I didn't test it at all, so I added
a pkg-message about it.


>How-To-Repeat:





>Fix:


--- prokyon3-0.9.1r1to0.9.2.diff begins here ---
diff -urN prokyon3.old/Makefile prokyon3/Makefile
--- prokyon3.old/Makefile	Sun Jan 25 12:42:43 2004
+++ prokyon3/Makefile	Sun Jan 25 13:09:19 2004
@@ -1,17 +1,15 @@
-# New ports collection makefile for:           prokyon3
-# Date created:                                11 November 2002
-# Whom:                                        Kay Lehmann
+# New ports collection makefile for:	prokyon3
+# Date created:				11 November 2002
+# Whom:					Kay Lehmann
 #
 # $FreeBSD: ports/audio/prokyon3/Makefile,v 1.4 2003/12/30 10:17:23 lofi Exp $
 #
 
 PORTNAME=	prokyon3
-PORTVERSION=	0.9.1.r1
-PORTREVISION=	1
+PORTVERSION=	0.9.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-r/}
 
 MAINTAINER=	kay_lehmann at web.de
 COMMENT=	Prokyon3 is a multithreaded MP3 manager and tag editor
@@ -21,16 +19,33 @@
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
 USE_QT_VER=	3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS+=	--with-qtdir=${X11BASE} --with-id3-libs=${LOCALBASE}\
-			--with-ogg-libs=${LOCALBASE} --with-vorbis-libs=${LOCALBASE}
+USE_GETOPT_LONG=yes
+USE_MYSQL=	yes
+CONFIGURE_ARGS+=--with-qtdir=${X11BASE} --with-id3-libs=${LOCALBASE}\
+	 	--with-ogg-libs=${LOCALBASE} --with-vorbis-libs=${LOCALBASE}
+
+.if defined(WITH_BURN)
+RUN_DEPENDS+=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
+		mpg123:${PORTSDIR}/audio/mpg123 \
+		ogg123:${PORTSDIR}/audio/vorbis-tools \
+		normalize:${PORTSDIR}/audio/normalize \
+		bash:${PORTSDIR}/shells/bash2
+PLIST_FILES+=	bin/prokburn
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-g -O2|${CFLAGS}|; s|-lqt-mt|-lqt-mt ${PTHREAD_LIBS}|' ${WRKSRC}/configure
+.if !defined(WITH_BURN)
+	@${REINPLACE_CMD} -e 's|prokburn||' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|prokburn||' ${WRKSRC}/Makefile.in
+.endif
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
+	@sleep 5
 
 .include <bsd.port.mk>
diff -urN prokyon3.old/distinfo prokyon3/distinfo
--- prokyon3.old/distinfo	Sun Jan 25 12:42:43 2004
+++ prokyon3/distinfo	Sun Dec  7 14:05:35 2003
@@ -1 +1 @@
-MD5 (prokyon3-0.9.1-r1.tar.gz) = 767f849e9ba4c5c4ec114f64ecf1824b
+MD5 (prokyon3-0.9.2.tar.gz) = 49e7b2662f4fffc3c366c4fb0ff53d4c
diff -urN prokyon3.old/files/patch-src-getopt.h prokyon3/files/patch-src-getopt.h
--- prokyon3.old/files/patch-src-getopt.h	Sun Jan 25 12:42:43 2004
+++ prokyon3/files/patch-src-getopt.h	Thu Jan  1 01:00:00 1970
@@ -1,18 +0,0 @@
---- src/getopt.h.orig	Sun Dec  8 19:29:14 2002
-+++ src/getopt.h	Mon Nov 24 21:07:44 2003
-@@ -15,9 +15,6 @@
-    along with this program; if not, write to the Free Software
-    Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
- 
--#ifndef _GETOPT_H
--#define _GETOPT_H 1
--
- #ifdef	__cplusplus
- extern "C" {
- #endif
-@@ -125,5 +122,3 @@
- #ifdef	__cplusplus
- }
- #endif
--
--#endif /* _GETOPT_H */
diff -urN prokyon3.old/files/patch-src-tagger_mp3.cpp prokyon3/files/patch-src-tagger_mp3.cpp
--- prokyon3.old/files/patch-src-tagger_mp3.cpp	Sun Jan 25 12:42:43 2004
+++ prokyon3/files/patch-src-tagger_mp3.cpp	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- src/tagger_mp3.cpp.orig	Mon Feb 17 00:01:44 2003
-+++ src/tagger_mp3.cpp	Mon Nov 24 21:00:58 2003
-@@ -448,7 +448,7 @@
- 	if(mp3->id3.comment[28] == '\0') {
- 	  mp3->id3.track[0] = mp3->id3.comment[29];
- 	}
--	mp3->file.readBlock(&(char)mp3->id3.genre[0], 1);
-+	mp3->file.readBlock((char*)&mp3->id3.genre[0], 1);
- 	unpad(mp3->id3.title);
- 	unpad(mp3->id3.artist);
- 	unpad(mp3->id3.album);
diff -urN prokyon3.old/files/patch-src_getopt.c prokyon3/files/patch-src_getopt.c
--- prokyon3.old/files/patch-src_getopt.c	Thu Jan  1 01:00:00 1970
+++ prokyon3/files/patch-src_getopt.c	Sun Dec  7 14:05:36 2003
@@ -0,0 +1,11 @@
+--- src/getopt.c.orig	Sat Sep 20 10:34:30 2003
++++ src/getopt.c	Sat Sep 20 10:35:56 2003
+@@ -24,6 +24,8 @@
+ #include "config.h"
+ #endif
+ 
++#define _(String)(String)
++
+ #ifndef __STDC__
+ /* This is a separate conditional since some stdc systems
+    reject `defined (const)'.  */
diff -urN prokyon3.old/files/patch_prokburn prokyon3/files/patch_prokburn
--- prokyon3.old/files/patch_prokburn	Thu Jan  1 01:00:00 1970
+++ prokyon3/files/patch_prokburn	Sun Jan 25 11:29:10 2004
@@ -0,0 +1,8 @@
+--- prokburn.orig	Sun Jan 25 11:25:18 2004
++++ prokburn	Sun Jan 25 11:25:41 2004
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/local/bin/bash
+ ####################################################################################"
+ #  A small bash utility to burn CD from prokyon3.
+ #					PH FERME
diff -urN prokyon3.old/pkg-descr prokyon3/pkg-descr
--- prokyon3.old/pkg-descr	Sun Jan 25 12:42:43 2004
+++ prokyon3/pkg-descr	Sun Dec  7 14:05:36 2003
@@ -1,10 +1,8 @@
-prokyon3 is a multithreaded MP3 manager and tag editor for Linux.
-It was written in C++ using the Qt3 widget set and the MySQL database.
-prokyon3 can access MP3 files on harddisk, CDROM, SMB and NFS. Files
-can be played using XMMS, and can even be played when the files are on
-CD as prokyon3 identifies CDs by content. The files view is customizable
-and favorite artists are supported. prokyon3 also offers an editor for
-ID3 tags and has been designed to support tagging for multiple files en
+prokyon3 is a multithreaded MP3 manager and tag editor for Linux. 
+It was written in C++ using the Qt3 widget set and the MySQL database. 
+prokyon3 can access MP3 files on harddisk, CDROM, SMB and NFS. Files 
+can be played using XMMS, and can even be played when the files are on 
+CD as prokyon3 identifies CDs by content. The files view is customizable 
+and favorite artists are supported. prokyon3 also offers an editor for 
+ID3 tags and has been designed to support tagging for multiple files en 
 masse.
-
-WWW: http://prokyon3.sourceforge.net/
diff -urN prokyon3.old/pkg-message prokyon3/pkg-message
--- prokyon3.old/pkg-message	Thu Jan  1 01:00:00 1970
+++ prokyon3/pkg-message	Sun Jan 25 12:33:54 2004
@@ -0,0 +1,5 @@
+WARNING:
+prokyon-0.9.2 introduces rudimental burning-support, which needs to be
+enabled using WITH_BURN=yes when installing this port. This feature 
+hasn't been tested at all. So you have been warned when anything weired
+happens using this feature.
\ No newline at end of file
diff -urN prokyon3.old/pkg-plist prokyon3/pkg-plist
--- prokyon3.old/pkg-plist	Sun Jan 25 12:42:43 2004
+++ prokyon3/pkg-plist	Sun Jan 25 12:12:12 2004
@@ -29,5 +29,26 @@
 share/prokyon3/images/pink_marble.png
 share/prokyon3/images/smiley.png
 share/prokyon3/images/splash4.png
+share/locale/de/LC_MESSAGES/prokyon3.mo
+share/locale/fr/LC_MESSAGES/prokyon3.mo
+share/locale/nl/LC_MESSAGES/prokyon3.mo
+share/prokyon3/images/action_burncd.png
+share/prokyon3/images/action_documentation.png
+share/prokyon3/html/manual_one_file/images/docbook/important.png
+share/prokyon3/html/manual_one_file/images/docbook/note.png
+share/prokyon3/html/manual_one_file/images/docbook/tip.png
+share/prokyon3/html/manual_one_file/images/docbook/warning.png
+share/prokyon3/html/manual_one_file/index.html
 @dirrm share/prokyon3/images
+ at dirrm share/prokyon3/html/manual_one_file/images/docbook
+ at dirrm share/prokyon3/html/manual_one_file/images
+ at dirrm share/prokyon3/html/manual_one_file
+ at dirrm share/prokyon3/html
 @dirrm share/prokyon3
+ at dirrm share/locale/de/LC_MESSAGES
+ at dirrm share/locale/fr/LC_MESSAGES
+ at dirrm share/locale/nl/LC_MESSAGES
+ at dirrm share/locale/de
+ at dirrm share/locale/fr
+ at dirrm share/locale/nl
+ at dirrm share/locale
--- prokyon3-0.9.1r1to0.9.2.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list