From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 8 13:10:02 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0731A16A4E2 for ; Sun, 8 May 2005 13:10:02 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6880643D69 for ; Sun, 8 May 2005 13:10:01 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j48DA1xu002030 for ; Sun, 8 May 2005 13:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j48DA1bW002028; Sun, 8 May 2005 13:10:01 GMT (envelope-from gnats) Resent-Date: Sun, 8 May 2005 13:10:01 GMT Resent-Message-Id: <200505081310.j48DA1bW002028@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 697FF16A4E2 for ; Sun, 8 May 2005 13:01:10 +0000 (GMT) Received: from hfep02.dion.ne.jp (hfep02.dion.ne.jp [203.181.105.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id C506243D67 for ; Sun, 8 May 2005 13:01:08 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([219.108.136.184]) by hfep02.dion.ne.jp with SMTP id <20050508130104021.VLP@hfep02.dion.ne.jp> for ; Sun, 8 May 2005 22:01:04 +0900 Message-Id: <20050508220009.2fe68720.tkato432@yahoo.com> Date: Sun, 8 May 2005 22:00:09 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/80764: Update port: audio/xsidplay to 1.6.5.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 May 2005 13:10:02 -0000 >Number: 80764 >Category: ports >Synopsis: Update port: audio/xsidplay to 1.6.5.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun May 08 13:10:01 GMT 2005 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p7 i386 >Organization: >Environment: >Description: - Update to version 1.6.5.2 Remove file: files/patch-src-songlendb-File.cpp pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/xsidplay/Makefile audio/xsidplay/Makefile --- /usr/ports/audio/xsidplay/Makefile Tue Apr 12 14:02:14 2005 +++ audio/xsidplay/Makefile Sun May 8 02:27:43 2005 @@ -6,8 +6,7 @@ # PORTNAME= xsidplay -PORTVERSION= 1.6.5.1a -PORTREVISION= 1 +PORTVERSION= 1.6.5.2 PORTEPOCH= 1 CATEGORIES= audio emulators MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/ @@ -16,25 +15,20 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Graphical front end for libsidplay -.if defined(WITH_SIDPLAY2) -LIB_DEPENDS= sidplay2.0:${PORTSDIR}/audio/libsidplay2 -.else -LIB_DEPENDS= sidplay.1:${PORTSDIR}/audio/libsidplay -.endif - USE_X_PREFIX= yes USE_QT_VER= 3 +USE_GNOME= gnometarget +WANT_GNOME= yes +USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-qt3 --with-qt-binaries=${X11BASE}/bin -.if defined(WITH_SIDPLAY2) -CONFIGURE_ARGS+= --with-sidplay2 -.endif -QTCPPFLAGS+= ${PTHREAD_CFLAGS} -QTCFGLIBS+= ${PTHREAD_LIBS} -USE_REINPLACE= yes +CONFIGURE_ARGS= --with-qt3 --with-qt-binaries=${X11BASE}/bin MAN1= xsidplay.1 +PLIST_FILES= bin/xsidplay + +QTCPPFLAGS+= ${PTHREAD_CFLAGS} +QTCFGLIBS+= ${PTHREAD_LIBS} .include @@ -42,22 +36,40 @@ CFLAGS+= -O0 .endif -pre-patch: -.for file in configure src/Makefile.in - @${REINPLACE_CMD} -e 's|lib-mt|libqt-mt|g' ${WRKSRC}/${file} -.endfor - @${REINPLACE_CMD} -e 's|-lqt|-lqt-mt|g' ${WRKSRC}/configure +.if ${HAVE_GNOME:Mesound}!="" +USE_GNOME+= esound +.else +CONFIGURE_ENV+= ac_cv_path_ESD_CONFIG="" +.endif + +.if defined(WITH_ARTS) +LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts +.else +CONFIGURE_ENV+= ac_cv_path_ARTSC_CONFIG="" +.endif + +.if defined(WITH_SIDPLAY2) +LIB_DEPENDS+= sidplay2.1:${PORTSDIR}/audio/libsidplay2 +CONFIGURE_ARGS+= --with-sidplay2 +QTCFGLIBS+= -Wl,--rpath,${LOCALBASE}/lib/sidplay/builders +.else +LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay +.endif + +.if defined(NOPORTDOCS) +PORTDOCS= README STIL.faq hv_sids.faq +.endif + +post-patch: @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}|g' ${WRKSRC}/xsidplay.1 do-install: - @${MKDIR} ${PREFIX}/share/pixmaps - @${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin - @${INSTALL_DATA} ${WRKSRC}/xsidplay.xpm ${PREFIX}/share/pixmaps - @${INSTALL_MAN} ${WRKSRC}/xsidplay.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/xsidplay.1 ${MANPREFIX}/man/man1 .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/*.faq ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.faq ${DOCSDIR} .endif .include diff -urN /usr/ports/audio/xsidplay/distinfo audio/xsidplay/distinfo --- /usr/ports/audio/xsidplay/distinfo Thu Mar 18 13:48:44 2004 +++ audio/xsidplay/distinfo Sun May 8 01:28:58 2005 @@ -1,2 +1,2 @@ -MD5 (xsidplay-1.6.5.1a.tgz) = abe90bc6b7d552969bdd1db38f0a449b -SIZE (xsidplay-1.6.5.1a.tgz) = 355698 +MD5 (xsidplay-1.6.5.2.tgz) = 68669cf99904a7384a65ded5fcdd3c97 +SIZE (xsidplay-1.6.5.2.tgz) = 508860 diff -urN /usr/ports/audio/xsidplay/files/patch-src-songlendb-File.cpp audio/xsidplay/files/patch-src-songlendb-File.cpp --- /usr/ports/audio/xsidplay/files/patch-src-songlendb-File.cpp Fri Feb 18 07:47:16 2005 +++ audio/xsidplay/files/patch-src-songlendb-File.cpp Thu Jan 1 09:00:00 1970 @@ -1,22 +0,0 @@ ---- src/songlendb/File.cpp.orig Sun Mar 3 19:00:03 2002 -+++ src/songlendb/File.cpp Thu Feb 17 22:46:43 2005 -@@ -29,6 +29,7 @@ - #endif - using namespace std; - -+#include - #include "File.h" - - // String comparison functor for sort function. -@@ -126,9 +127,9 @@ - streampos fileLen = myIn.tellg(); - #endif - #ifdef XSID_HAVE_NOTHROW -- pDB = new(std::nothrow) char[fileLen+1L]; -+ pDB = new(std::nothrow) char[(off_t)fileLen+1L]; - #else -- pDB = new char[fileLen+1L]; -+ pDB = new char[(off_t)fileLen+1L]; - #endif - if ( pDB == 0 ) - { diff -urN /usr/ports/audio/xsidplay/pkg-plist audio/xsidplay/pkg-plist --- /usr/ports/audio/xsidplay/pkg-plist Wed Oct 22 20:47:07 2003 +++ audio/xsidplay/pkg-plist Thu Jan 1 09:00:00 1970 @@ -1,7 +0,0 @@ -bin/xsidplay -share/pixmaps/xsidplay.xpm -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/STIL.faq -%%PORTDOCS%%%%DOCSDIR%%/hv_sids.faq -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/share/pixmaps 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted: