From tkato432@yahoo.com  Sat Jun  2 18:30:33 2012
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8E848106564A
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat,  2 Jun 2012 18:30:28 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa103lp.auone-net.jp (msa103lp.auone-net.jp [222.3.140.166])
	by mx1.freebsd.org (Postfix) with ESMTP id 37F7B8FC15
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat,  2 Jun 2012 18:30:28 +0000 (UTC)
Received: from msa103lp.auone-net.jp (MSA103lp [172.27.12.181])
	by msa103lp.auone-net.jp (au one net msa) with ESMTP id 871377D4131
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun,  3 Jun 2012 03:30:27 +0900 (JST)
Received: from localhost.localdomain (ZT037195.ppp.dion.ne.jp [59.128.37.195])
	by msa103lp.auone-net.jp (au one net msa) with ESMTP id 63FB647C036
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun,  3 Jun 2012 03:30:18 +0900 (JST)
Message-Id: <20120603032120.41186d25.tkato432@yahoo.com>
Date: Sun, 3 Jun 2012 03:21:20 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: audio/muse: Update MASTER_SITES

>Number:         168590
>Category:       ports
>Synopsis:       audio/muse: Update MASTER_SITES
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sylvio
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 02 18:40:14 UTC 2012
>Closed-Date:    Tue Jun 05 20:38:26 UTC 2012
>Last-Modified:  Tue Jun  5 20:40:15 UTC 2012
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES
- Add LICENSE
- Add MAKE_JOBS_SAFE
- Support PORTDOCS/PLIST_FILES

Remove file:
files/extra-patch-broken-scandir
pkg-plist

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/muse/Makefile audio/muse/Makefile
--- /usr/ports/audio/muse/Makefile	2012-06-01 20:56:11.000000000 +0900
+++ audio/muse/Makefile	2012-06-03 02:22:59.000000000 +0900
@@ -8,34 +8,38 @@
 
 PORTNAME=	MuSE
 PORTVERSION=	0.9.2
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.dyne.org/muse/releases/ \
-		http://www.ljudmila.org/~jaromil/muse/releases/
+MASTER_SITES=	http://files.dyne.org/muse/releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multiple Streaming Engine
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
 		ogg.7:${PORTSDIR}/audio/libogg
 
+OPTIONS_DEFINE=	X11 LAME SNDFILE DOCS
+OPTIONS_DEFAULT=X11
+
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug --disable-lubrify --disable-rpath
-CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT -DHAVE_SYS_UIO_H \
-		${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
+MAKE_JOBS_SAFE=	yes
 
-OPTIONS_DEFINE=	X11 LAME SNDFILE
-OPTIONS_DEFAULT=	X11
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_SYS_UIO_H ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}
 
-.include <bsd.port.pre.mk>
+MAN1=		muse.1
+PORTDOCS=	AUTHORS ChangeLog NEWS KNOWN-BUGS README TODO USAGE
+PLIST_FILES=	bin/muse
+.for lang in es it
+PLIST_FILES+=	share/locale/${lang}/LC_MESSAGES/muse.mo
+.endfor
 
-.if ${OSVERSION} < 800501
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-broken-scandir
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
 USE_GNOME+=	gtk20
@@ -44,20 +48,30 @@
 CONFIGURE_ARGS+=--without-x --with-rubik
 .endif
 
-.if ${PORT_OPTIONS:MMP3} || exists(${LOCALBASE}/lib/libmp3lame.so.0)
+.if ${PORT_OPTIONS:MLAME}
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
+.else
+CONFIGURE_ENV+=	ac_cv_header_lame_lame_h=no
 .endif
 
-.if ${PORT_OPTIONS:MSNDFILE} || exists(${LOCALBASE}/lib/libsndfile.so.1)
+.if ${PORT_OPTIONS:MSNDFILE}
 LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
 .endif
 
-MAN1=		muse.1
-
 post-patch:
-.if exists(/usr/include/sys/soundcard.h)
-	${REINPLACE_CMD} -e "s,machine/soundcard.h,sys/soundcard.h,g" \
+	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' \
 		${WRKSRC}/src/portaudio/pa_unix_oss.c
+.if empty(PORT_OPTIONS:MSNDFILE)
+	@${REINPLACE_CMD} -e '/sndfile >=/s|$$PKG_CONFIG|${FALSE}|' \
+		${WRKSRC}/configure
+.endif
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/audio/muse/files/extra-patch-broken-scandir audio/muse/files/extra-patch-broken-scandir
--- /usr/ports/audio/muse/files/extra-patch-broken-scandir	2010-08-23 06:38:19.000000000 +0900
+++ audio/muse/files/extra-patch-broken-scandir	1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- src/jmixer.cpp.orig	2004-12-16 03:04:31.000000000 -0800
-+++ src/jmixer.cpp	2010-08-22 14:15:03.000000000 -0700
-@@ -640,7 +640,7 @@
- /* this is the function selecting files for the scandir
-    on freebsd systems you should change the following line to:
-    int selector(struct dirent *dir) {    */
--int selector(const struct dirent *dir) {
-+int selector(struct dirent *dir) {
-   if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0
- #ifdef HAVE_VORBIS
-       || strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0
diff -urN /usr/ports/audio/muse/files/patch-Makefile.in audio/muse/files/patch-Makefile.in
--- /usr/ports/audio/muse/files/patch-Makefile.in	2006-08-07 12:34:42.000000000 +0900
+++ audio/muse/files/patch-Makefile.in	2012-06-02 04:49:47.000000000 +0900
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Aug  4 12:11:20 2006
-+++ Makefile.in	Fri Aug  4 12:11:27 2006
-@@ -240,7 +240,7 @@
- target_vendor = @target_vendor@
- SUBDIRS = po intl src
- docs_DATA = README COPYING AUTHORS NEWS KNOWN-BUGS ChangeLog TODO USAGE
--docsdir = ${prefix}/doc/MuSE
-+docsdir = ${prefix}/share/doc/MuSE
- man_MANS = muse.1
- ACLOCAL_AMFLAGS = -I . -I m4
- EXTRA_DIST = autogen.sh config.rpath
+--- Makefile.in.orig	2005-12-27 22:09:38.000000000 +0900
++++ Makefile.in	2012-06-02 04:45:45.000000000 +0900
+@@ -690,7 +690,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-docsDATA install-man
++install-data-am: install-man
+ 
+ install-exec-am:
+ 
diff -urN /usr/ports/audio/muse/files/patch-src::jmixer.cpp audio/muse/files/patch-src::jmixer.cpp
--- /usr/ports/audio/muse/files/patch-src::jmixer.cpp	2010-04-11 15:45:51.000000000 +0900
+++ audio/muse/files/patch-src::jmixer.cpp	2012-05-29 07:39:38.000000000 +0900
@@ -1,6 +1,6 @@
---- src/jmixer.cpp.orig	Fri Aug  4 11:44:33 2006
-+++ src/jmixer.cpp	Fri Aug  4 11:46:02 2006
-@@ -20,18 +20,18 @@
+--- src/jmixer.cpp.orig	2004-12-16 20:04:31.000000000 +0900
++++ src/jmixer.cpp	2012-05-29 07:39:23.000000000 +0900
+@@ -20,18 +20,19 @@
   */
  
  #include <iostream>
@@ -15,6 +15,7 @@
  #include <sys/ioctl.h>
  #include <sys/stat.h>
 -#include <errno.h>
++#include <sys/param.h>
 +#include <cerrno>
  #include <fcntl.h>
  
@@ -25,3 +26,15 @@
  #include <sys/types.h>
  #include <sys/wait.h>
  #include <termios.h>
+@@ -640,7 +641,11 @@
+ /* this is the function selecting files for the scandir
+    on freebsd systems you should change the following line to:
+    int selector(struct dirent *dir) {    */
++#if defined(__FreeBSD__) && __FreeBSD_version < 800501
++int selector(struct dirent *dir) {
++#else
+ int selector(const struct dirent *dir) {
++#endif
+   if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0
+ #ifdef HAVE_VORBIS
+       || strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0
diff -urN /usr/ports/audio/muse/pkg-plist audio/muse/pkg-plist
--- /usr/ports/audio/muse/pkg-plist	2008-06-15 01:17:10.000000000 +0900
+++ audio/muse/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,12 +0,0 @@
-bin/muse
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/KNOWN-BUGS
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/USAGE
-share/locale/es/LC_MESSAGES/muse.mo
-share/locale/it/LC_MESSAGES/muse.mo
-@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sylvio 
Responsible-Changed-By: sylvio 
Responsible-Changed-When: Sat Jun 2 22:00:52 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168590 
State-Changed-From-To: open->closed 
State-Changed-By: sylvio 
State-Changed-When: Tue Jun 5 20:38:25 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168590: commit references a PR
Date: Tue,  5 Jun 2012 20:38:29 +0000 (UTC)

 sylvio      2012-06-05 20:38:19 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/muse           Makefile 
     audio/muse/files     patch-Makefile.in patch-src::jmixer.cpp 
   Removed files:
     audio/muse           pkg-plist 
     audio/muse/files     extra-patch-broken-scandir 
   Log:
   - Update MASTER_SITES
   - Add LICENSE
   - Add MAKE_JOBS_SAFE
   - Support PORTDOCS/PLIST_FILES
   
   Remove file:
   files/extra-patch-broken-scandir
   pkg-plist
   
   PR:             ports/168590
   Submitted by:   KATO Tsuguru <tkato432@yahoo.com>
   
   Revision  Changes    Path
   1.48      +34 -20    ports/audio/muse/Makefile
   1.2       +0 -11     ports/audio/muse/files/extra-patch-broken-scandir (dead)
   1.4       +11 -11    ports/audio/muse/files/patch-Makefile.in
   1.4       +16 -3     ports/audio/muse/files/patch-src::jmixer.cpp
   1.6       +0 -12     ports/audio/muse/pkg-plist (dead)
 _______________________________________________
 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:
