Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 May 2000 11:40:14 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/18882: Update port: audio/xamp to 0.8.10
Message-ID:  <20000529184014.9F67137BCC4@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         18882
>Category:       ports
>Synopsis:       Update port: audio/xamp to 0.8.10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 29 11:50:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.8.10
- Add skin data
- Add WWW: line into pkg/DESCR

New file:
patches/patch-ag  patches/patch-ah  patches/patch-ai  patches/patch-aj
patches/patch-ak  patches/patch-al

Remove file:
patches/patch-ad  patches/patch-af

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/audio/xamp/Makefile audio/xamp/Makefile
--- /usr/ports/audio/xamp/Makefile	Mon Apr 17 20:06:42 2000
+++ audio/xamp/Makefile	Tue May 30 03:31:06 2000
@@ -6,24 +6,36 @@
 #
 
 PORTNAME=	xamp
-PORTVERSION=	0.8.7
+PORTVERSION=	0.8.10
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.simcb.ru/pub/unix/x11/
-DISTFILES=	xamp-0.8-7.tgz
+MASTER_SITES=	http://andrej.co.ru/~andrej/programs/xamp/ \
+		http://andrej.co.ru/~andrej/programs/xamp/backs/
+DISTFILES=	${PORTNAME}-0.8-10.tgz ${SKIN_DATA}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_QT=		yes
 
-WRKSRC=		${WRKDIR}/xamp-0.8/xamp-0.8
-GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-0.8/${PORTNAME}-0.8g/
+
+DIST_SUBDIR=	xamp
+USE_QT=		yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
 
 MAN1=		xamp.1
 
+SKIN_DATA=	bfamp.tar.gz chrome.tar.gz mmxamp.tar.gz
+SKIN_DIR=	${PREFIX}/lib/X11/xamp
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xamp.1 ${PREFIX}/man/man1
+	@${MKDIR} ${SKIN_DIR}/bfamp-xamp
+	${INSTALL_DATA} ${WRKDIR}/bfamp-xamp/*.bmp ${SKIN_DIR}/bfamp-xamp
+	@${MKDIR} ${SKIN_DIR}/chrome-xamp
+	${INSTALL_DATA} ${WRKDIR}/chrome-xamp/*.bmp ${SKIN_DIR}/chrome-xamp
+	@${MKDIR} ${SKIN_DIR}/mmxxamp-xamp
+	${INSTALL_DATA} ${WRKDIR}/mmxxamp-xamp/*.bmp ${SKIN_DIR}/mmxxamp-xamp
 
 .include <bsd.port.mk>
diff -urN /usr/ports/audio/xamp/files/md5 audio/xamp/files/md5
--- /usr/ports/audio/xamp/files/md5	Tue Aug 25 11:02:43 1998
+++ audio/xamp/files/md5	Tue May 30 03:31:52 2000
@@ -1 +1,4 @@
-MD5 (xamp-0.8-7.tgz) = 96cb75347f7ae69390f9d30161b25b97
+MD5 (xamp/xamp-0.8-10.tgz) = 6baec3236fbeaf2de994ec3421d0186e
+MD5 (xamp/bfamp.tar.gz) = 0831c191b987b2f9ce741508b10a3559
+MD5 (xamp/chrome.tar.gz) = bdae4fc85c9f7601a3b6ee9b0d122921
+MD5 (xamp/mmxamp.tar.gz) = 400c441b72ce2b38d7fd75f6e0e7bf3b
diff -urN /usr/ports/audio/xamp/patches/patch-ad audio/xamp/patches/patch-ad
--- /usr/ports/audio/xamp/patches/patch-ad	Tue Aug 25 11:02:43 1998
+++ audio/xamp/patches/patch-ad	Thu Jan  1 09:00:00 1970
@@ -1,22 +0,0 @@
---- ../audioIO.h.orig	Tue Aug 18 12:45:04 1998
-+++ ../audioIO.h	Tue Aug 18 12:45:53 1998
-@@ -12,7 +12,7 @@
- #endif
- 
- #ifdef OS_BSD
--  #define AUSIZ 32768
-+extern int AUSIZ;
- #endif
- 
- #if defined(OS_IRIX) || defined(OS_IRIX64)
---- ../audioIO_Linux.c.orig	Tue Aug 18 12:46:03 1998
-+++ ../audioIO_Linux.c	Tue Aug 18 12:46:26 1998
-@@ -26,7 +26,7 @@
- 
- /* optimal fragment size */
- 
--int AUSIZ = 0;
-+int AUSIZ = 32768;
- 
- /* declare these static to effectively isolate the audio device */
- 
diff -urN /usr/ports/audio/xamp/patches/patch-ae audio/xamp/patches/patch-ae
--- /usr/ports/audio/xamp/patches/patch-ae	Fri Feb  5 01:22:41 1999
+++ audio/xamp/patches/patch-ae	Tue May 30 01:30:12 2000
@@ -1,26 +1,6 @@
---- Makefile.in.orig	Wed Feb 11 07:37:20 1998
-+++ Makefile.in	Wed Feb  3 23:00:03 1999
-@@ -14,7 +14,8 @@
- DEFINES = -DOS_@OS_TYPE@ -DARCH_@ARCH_TYPE@
- CFLAGS = @CFLAGS@ ${DEFINES} ${DEBUG} ${BACK}
- LDFLAGS = @LDFLAGS@
--INSTALL= @INSTALL@
-+INSTALL= @INSTALL@ -s
-+DESTDIR= ${PREFIX}/bin
- 
- #
- # uncomment both of these if you want profiling support
-@@ -38,6 +39,9 @@
- 	backs/backs.o
- 	
- LIBS = @QT_LDFLAGS@ -lm -lqt
-+ifeq ($(PORTOBJFORMAT),elf)
-+LIBS+= -Wl,-rpath,$(X11BASE)/lib
-+endif
- 
- all: xamp
- 
-@@ -59,7 +63,7 @@
+--- Makefile.in.orig	Fri Jul 31 02:48:02 1998
++++ Makefile.in	Tue May 30 01:29:51 2000
+@@ -58,7 +58,7 @@
  	cd pixmaps ; make
  
  xamp: images $(OBJ) 
@@ -28,4 +8,4 @@
 +	$(CXX) -o xamp $(OBJ) $(LDFLAGS) $(LIBS) 
  	
  install:
- 	$(INSTALL) -m 755 xamp $(DESTDIR)
+ 	$(INSTALL) -m 755 xamp $(DESTDIR)/xamp
diff -urN /usr/ports/audio/xamp/patches/patch-af audio/xamp/patches/patch-af
--- /usr/ports/audio/xamp/patches/patch-af	Thu Jan 27 20:07:09 2000
+++ audio/xamp/patches/patch-af	Thu Jan  1 09:00:00 1970
@@ -1,48 +0,0 @@
---- QtAMPData.cpp.orig	Tue Jan 25 01:35:30 2000
-+++ QtAMPData.cpp	Tue Jan 25 01:35:55 2000
-@@ -19,6 +19,9 @@
- #include <qkeycode.h>
- #include <qtooltip.h>
- 
-+#define QColor(i)	(QColor)(i)
-+#define QRgb(i)		(QRgb)(i)
-+
- QtAMPData::QtAMPData
- (
- 	QWidget* parent,
---- dirDlgData.cpp.orig	Tue Jan 25 01:36:16 2000
-+++ dirDlgData.cpp	Tue Jan 25 01:36:43 2000
-@@ -6,6 +6,9 @@
- #include <qframe.h>
- #include <qlabel.h>
- 
-+#define QColor(i)	(QColor)(i)
-+#define QRgb(i)		(QRgb)(i)
-+
- dirDlgData::dirDlgData
- (
- 	QWidget* parent,
---- id3Data.cpp.orig	Tue Jan 25 01:37:13 2000
-+++ id3Data.cpp	Tue Jan 25 01:37:40 2000
-@@ -17,6 +17,9 @@
- #include <qframe.h>
- #include <qlabel.h>
- 
-+#define QColor(i)	(QColor)(i)
-+#define QRgb(i)		(QRgb)(i)
-+
- id3Data::id3Data
- (
- 	QWidget* parent,
---- plDlgData.cpp.orig	Mon Feb  2 14:16:06 1998
-+++ plDlgData.cpp	Tue Jan 25 01:34:41 2000
-@@ -18,6 +18,9 @@
- #include <qlabel.h>
- #include <qkeycode.h>
- 
-+#define QColor(i)	(QColor)(i)
-+#define QRgb(i)		(QRgb)(i)
-+
- plDlgData::plDlgData
- (
- 	QWidget* parent,
diff -urN /usr/ports/audio/xamp/patches/patch-ag audio/xamp/patches/patch-ag
--- /usr/ports/audio/xamp/patches/patch-ag	Thu Jan  1 09:00:00 1970
+++ audio/xamp/patches/patch-ag	Tue May 30 01:45:00 2000
@@ -0,0 +1,11 @@
+--- ../audioIO.h.orig	Tue Aug 18 12:45:04 1998
++++ ../audioIO.h	Tue Aug 18 12:45:53 1998
+@@ -12,7 +12,7 @@
+ #endif
+ 
+ #ifdef OS_BSD
+-  #define AUSIZ 32768
++extern int AUSIZ;
+ #endif
+ 
+ #if defined(OS_IRIX) || defined(OS_IRIX64)
diff -urN /usr/ports/audio/xamp/patches/patch-ah audio/xamp/patches/patch-ah
--- /usr/ports/audio/xamp/patches/patch-ah	Thu Jan  1 09:00:00 1970
+++ audio/xamp/patches/patch-ah	Tue May 30 01:45:07 2000
@@ -0,0 +1,11 @@
+--- ../audioIO_Linux.c.orig	Tue Aug 18 12:46:03 1998
++++ ../audioIO_Linux.c	Tue Aug 18 12:46:26 1998
+@@ -26,7 +26,7 @@
+ 
+ /* optimal fragment size */
+ 
+-int AUSIZ = 0;
++int AUSIZ = 32768;
+ 
+ /* declare these static to effectively isolate the audio device */
+ 
diff -urN /usr/ports/audio/xamp/patches/patch-ai audio/xamp/patches/patch-ai
--- /usr/ports/audio/xamp/patches/patch-ai	Thu Jan  1 09:00:00 1970
+++ audio/xamp/patches/patch-ai	Tue May 30 03:34:18 2000
@@ -0,0 +1,12 @@
+--- QtAMPData.cpp.orig	Tue Jan 25 01.35.30 2000
++++ QtAMPData.cpp	Tue Jan 25 01:35:55 2000
+@@ -19,6 +19,9 @@
+ #include <qkeycode.h>
+ #include <qtooltip.h>
+ 
++#define QColor(i)	(QColor)(i)
++#define QRgb(i)		(QRgb)(i)
++
+ QtAMPData::QtAMPData
+ (
+ 	QWidget* parent,
diff -urN /usr/ports/audio/xamp/patches/patch-aj audio/xamp/patches/patch-aj
--- /usr/ports/audio/xamp/patches/patch-aj	Thu Jan  1 09:00:00 1970
+++ audio/xamp/patches/patch-aj	Tue May 30 03:34:48 2000
@@ -0,0 +1,12 @@
+--- dirDlgData.cpp.orig	Tue Jan 25 01:36:16 2000
++++ dirDlgData.cpp	Tue Jan 25 01:36:43 2000
+@@ -6,6 +6,9 @@
+ #include <qframe.h>
+ #include <qlabel.h>
+ 
++#define QColor(i)	(QColor)(i)
++#define QRgb(i)		(QRgb)(i)
++
+ dirDlgData::dirDlgData
+ (
+ 	QWidget* parent,
diff -urN /usr/ports/audio/xamp/patches/patch-ak audio/xamp/patches/patch-ak
--- /usr/ports/audio/xamp/patches/patch-ak	Thu Jan  1 09:00:00 1970
+++ audio/xamp/patches/patch-ak	Tue May 30 03:35:18 2000
@@ -0,0 +1,12 @@
+--- id3Data.cpp.orig	Tue Jan 25 01:37:13 2000
++++ id3Data.cpp	Tue Jan 25 01:37:40 2000
+@@ -17,6 +17,9 @@
+ #include <qframe.h>
+ #include <qlabel.h>
+ 
++#define QColor(i)	(QColor)(i)
++#define QRgb(i)		(QRgb)(i)
++
+ id3Data::id3Data
+ (
+ 	QWidget* parent,
diff -urN /usr/ports/audio/xamp/patches/patch-al audio/xamp/patches/patch-al
--- /usr/ports/audio/xamp/patches/patch-al	Thu Jan  1 09:00:00 1970
+++ audio/xamp/patches/patch-al	Tue May 30 03:35:50 2000
@@ -0,0 +1,12 @@
+--- plDlgData.cpp.orig	Mon Feb  2 14:16:06 1998
++++ plDlgData.cpp	Tue Jan 25 01:34:41 2000
+@@ -18,6 +18,9 @@
+ #include <qlabel.h>
+ #include <qkeycode.h>
+ 
++#define QColor(i)	(QColor)(i)
++#define QRgb(i)		(QRgb)(i)
++
+ plDlgData::plDlgData
+ (
+ 	QWidget* parent,
diff -urN /usr/ports/audio/xamp/pkg/DESCR audio/xamp/pkg/DESCR
--- /usr/ports/audio/xamp/pkg/DESCR	Tue Aug 25 11:02:43 1998
+++ audio/xamp/pkg/DESCR	Mon May 29 23:57:32 2000
@@ -12,6 +12,7 @@
 
 Have fun!
 
+WWW: http://andrej.co.ru/~andrej/programs/xamp/
 
 - Joe
 jslu@dns.ntu.edu.tw
diff -urN /usr/ports/audio/xamp/pkg/PLIST audio/xamp/pkg/PLIST
--- /usr/ports/audio/xamp/pkg/PLIST	Tue Aug 25 11:02:43 1998
+++ audio/xamp/pkg/PLIST	Tue May 30 03:11:06 2000
@@ -1 +1,68 @@
 bin/xamp
+lib/X11/xamp/bfamp-xamp/ff.bmp
+lib/X11/xamp/bfamp-xamp/load.bmp
+lib/X11/xamp/bfamp-xamp/main.bmp
+lib/X11/xamp/bfamp-xamp/mono.bmp
+lib/X11/xamp/bfamp-xamp/mpause.bmp
+lib/X11/xamp/bfamp-xamp/mplay.bmp
+lib/X11/xamp/bfamp-xamp/mstop.bmp
+lib/X11/xamp/bfamp-xamp/pause.bmp
+lib/X11/xamp/bfamp-xamp/pl.bmp
+lib/X11/xamp/bfamp-xamp/play.bmp
+lib/X11/xamp/bfamp-xamp/posbar.bmp
+lib/X11/xamp/bfamp-xamp/posbut.bmp
+lib/X11/xamp/bfamp-xamp/rep.bmp
+lib/X11/xamp/bfamp-xamp/repc.bmp
+lib/X11/xamp/bfamp-xamp/rew.bmp
+lib/X11/xamp/bfamp-xamp/shuffle.bmp
+lib/X11/xamp/bfamp-xamp/shufflen.bmp
+lib/X11/xamp/bfamp-xamp/stereo.bmp
+lib/X11/xamp/bfamp-xamp/stop.bmp
+lib/X11/xamp/bfamp-xamp/vol.bmp
+lib/X11/xamp/bfamp-xamp/xopy.bmp
+lib/X11/xamp/chrome-xamp/ff.bmp
+lib/X11/xamp/chrome-xamp/load.bmp
+lib/X11/xamp/chrome-xamp/main.bmp
+lib/X11/xamp/chrome-xamp/mono.bmp
+lib/X11/xamp/chrome-xamp/mpause.bmp
+lib/X11/xamp/chrome-xamp/mplay.bmp
+lib/X11/xamp/chrome-xamp/mstop.bmp
+lib/X11/xamp/chrome-xamp/pause.bmp
+lib/X11/xamp/chrome-xamp/pl.bmp
+lib/X11/xamp/chrome-xamp/play.bmp
+lib/X11/xamp/chrome-xamp/posbar.bmp
+lib/X11/xamp/chrome-xamp/posbut.bmp
+lib/X11/xamp/chrome-xamp/rep.bmp
+lib/X11/xamp/chrome-xamp/repc.bmp
+lib/X11/xamp/chrome-xamp/rew.bmp
+lib/X11/xamp/chrome-xamp/shuffle.bmp
+lib/X11/xamp/chrome-xamp/shufflen.bmp
+lib/X11/xamp/chrome-xamp/stereo.bmp
+lib/X11/xamp/chrome-xamp/stop.bmp
+lib/X11/xamp/chrome-xamp/vol.bmp
+lib/X11/xamp/chrome-xamp/xopy.bmp
+lib/X11/xamp/mmxxamp-xamp/ff.bmp
+lib/X11/xamp/mmxxamp-xamp/load.bmp
+lib/X11/xamp/mmxxamp-xamp/main.bmp
+lib/X11/xamp/mmxxamp-xamp/mono.bmp
+lib/X11/xamp/mmxxamp-xamp/mpause.bmp
+lib/X11/xamp/mmxxamp-xamp/mplay.bmp
+lib/X11/xamp/mmxxamp-xamp/mstop.bmp
+lib/X11/xamp/mmxxamp-xamp/pause.bmp
+lib/X11/xamp/mmxxamp-xamp/pl.bmp
+lib/X11/xamp/mmxxamp-xamp/play.bmp
+lib/X11/xamp/mmxxamp-xamp/posbar.bmp
+lib/X11/xamp/mmxxamp-xamp/posbut.bmp
+lib/X11/xamp/mmxxamp-xamp/rep.bmp
+lib/X11/xamp/mmxxamp-xamp/repc.bmp
+lib/X11/xamp/mmxxamp-xamp/rew.bmp
+lib/X11/xamp/mmxxamp-xamp/shuffle.bmp
+lib/X11/xamp/mmxxamp-xamp/shufflen.bmp
+lib/X11/xamp/mmxxamp-xamp/stereo.bmp
+lib/X11/xamp/mmxxamp-xamp/stop.bmp
+lib/X11/xamp/mmxxamp-xamp/vol.bmp
+lib/X11/xamp/mmxxamp-xamp/xopy.bmp
+@dirrm lib/X11/xamp/mmxxamp-xamp
+@dirrm lib/X11/xamp/chrome-xamp
+@dirrm lib/X11/xamp/bfamp-xamp
+@dirrm lib/X11/xamp


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


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000529184014.9F67137BCC4>