Update to 0.8.10. Add skin data, WWW: to pkg/DESCR.

PR:		18882
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

5 files changed, 91 insertions, 32 deletions

diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index aecf3bc36ed3..c1d1b14aeb57 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -6,24 +6,32 @@
 #
 
 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
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-0.8/${PORTNAME}-0.8g/
+DIST_SUBDIR=	xamp
 USE_QT=		yes
-
-WRKSRC=		${WRKDIR}/xamp-0.8/xamp-0.8
-GNU_CONFIGURE=	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 --git a/audio/xamp/distinfo b/audio/xamp/distinfo
index 97b5f9a9bc6c..c84c2da3ffcc 100644
--- a/audio/xamp/distinfo
+++ b/audio/xamp/distinfo
@@ -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 --git a/audio/xamp/files/patch-ae b/audio/xamp/files/patch-ae
index 5dd9e0a7a64d..6bd5c7abc55a 100644
--- a/audio/xamp/files/patch-ae
+++ b/audio/xamp/files/patch-ae
@@ -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 --git a/audio/xamp/pkg-descr b/audio/xamp/pkg-descr
index 24c94121f140..ec2e79d1b498 100644
--- a/audio/xamp/pkg-descr
+++ b/audio/xamp/pkg-descr
@@ -12,6 +12,7 @@ detail.
 
 Have fun!
 
+WWW: http://andrej.co.ru/~andrej/programs/xamp/
 
 - Joe
 jslu@dns.ntu.edu.tw
diff --git a/audio/xamp/pkg-plist b/audio/xamp/pkg-plist
index e19d5200f2e5..82bdaa80888d 100644
--- a/audio/xamp/pkg-plist
+++ b/audio/xamp/pkg-plist
@@ -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