15 files changed, 58 insertions, 38 deletions

diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index e8b21846e9fa..55ebac0ee393 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -3,13 +3,15 @@
 # Date created:		5 January 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.5 1996/04/18 16:31:59 ache Exp $
+# $Id: Makefile,v 1.6 1996/10/25 13:32:26 ache Exp $
 #
 
 DISTNAME=       gsm-1.0.10
-CATEGORIES+=	audio
+CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/
 
+MAINTAINER=	pst@FreeBSD.org
+
 WRKSRC=         ${WRKDIR}/gsm-1.0-pl10
 
 post-install:
diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile
index e26eea56a42b..2eaaed658032 100644
--- a/audio/maplay/Makefile
+++ b/audio/maplay/Makefile
@@ -3,15 +3,17 @@
 # Date created:         Feb 13 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:43:49 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/11 19:46:44 asami Exp $
 #
 
 DISTNAME=       maplay1_2
 PKGNAME=	maplay-1.2
-CATEGORIES+=	audio
+CATEGORIES=	audio
 MASTER_SITES=   ftp://ftp.iuma.com/audio_utils/mpeg_players/Workstations/
 EXTRACT_SUFX=	.tar.Z
 
+MAINTAINER=	jkh@FreeBSD.org
+
 NO_WRKSUBDIR=	yes
 PATCH_STRIP=	-p2
 
diff --git a/audio/mpegaudio/Makefile b/audio/mpegaudio/Makefile
index 41737fb79499..ea0085378b36 100644
--- a/audio/mpegaudio/Makefile
+++ b/audio/mpegaudio/Makefile
@@ -2,12 +2,12 @@
 # Date created:		1 July 1996
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/07/06 09:27:10 gpalmer Exp $
 #
 
 DISTNAME=	mpegaudio
 PKGNAME=	mpegaudio-3.9
-CATEGORIES+=	audio
+CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.iuma.com/audio_utils/converters/source/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index dc65ca72aa0c..2a4c3c620e2a 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -3,14 +3,16 @@
 # Date created:		03 Nov 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.4 1995/10/04 10:31:58 asami Exp $
+# $Id: Makefile,v 1.5 1996/10/03 13:42:48 adam Exp $
 #
 
 DISTNAME=	nas-1.2p5
 PKGNAME=	nas-1.2.5
-CATEGORIES+=	audio
+CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.x.org/contrib/audio/nas/
 
+MAINTAINER=	jkh@FreeBSD.org
+
 USE_IMAKE=	yes
 ALL_TARGET=	World
 # no need to "xmkmf -a" and create the Makefiles twice -- see above
diff --git a/audio/radio/Makefile b/audio/radio/Makefile
index 206a4dac4112..d78a0e9e81f0 100644
--- a/audio/radio/Makefile
+++ b/audio/radio/Makefile
@@ -3,14 +3,16 @@
 # Date created:		5 July 1995
 # Whom:			janek@gaja.ipan.lublin.pl
 #
-# $Id: Makefile,v 1.3 1996/10/18 07:47:10 max Exp $
+# $Id: Makefile,v 1.4 1996/10/18 16:11:04 max Exp $
 #
 
 DISTNAME=	radio2.0.4
 PKGNAME=	radio-2.0.4
-CATEGORIES+=	audio net
+CATEGORIES=	audio net
 MASTER_SITES=	ftp://ftp.cwi.nl/pub/audio/
 
+MAINTAINER=	janek@gaja.ipan.lublin.pl
+
 NO_WRKSUBDIR=	yes
 MAKE_FLAGS=	FreeBSD -f
 
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index f0a33de9915b..1a66b2a0ebfc 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -3,13 +3,15 @@
 # Date created:		16 March 1995  
 # Whom:			rmallory@csusb.edu
 #
-# $Id: Makefile,v 1.4 1995/06/21 11:46:16 asami Exp $
+# $Id: Makefile,v 1.5 1996/10/03 14:13:05 adam Exp $
 #
 
 DISTNAME=	rplay-3.2.0b5
-CATEGORIES+=	audio
+CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.sdsu.edu/pub/rplay/
 
+MAINTAINER=	rmallory@csusb.edu
+
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile
index 2813adffb82a..522675c532a4 100644
--- a/audio/rsynth/Makefile
+++ b/audio/rsynth/Makefile
@@ -3,22 +3,24 @@
 # Date created:		03 Jan 1995
 # Whom:			faulkner@mpd.tandem.com
 #
-# $Id$
+# $Id: Makefile,v 1.7 1996/11/15 06:11:41 asami Exp $
 #
 
 DISTNAME=	rsynth-2.0
 CATEGORIES=	audio
 MASTER_SITES=	ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/synthesis/
 
+MAINTAINER=	faulkner@mpd.tandem.com
+
 BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
 EXEC_DEPENDS=	auvoxware:${PORTSDIR}/audio/nas
 
 GNU_CONFIGURE=	YES
 
 pre-configure:
-	@cp ${FILESDIR}/freebsdplay.c ${WRKSRC}/config/freebsdplay.c
-	@cp ${FILESDIR}/config.guess ${WRKSRC}/config.guess
-	@cp ${FILESDIR}/config.sub ${WRKSRC}/config.sub
-	@cp ${FILESDIR}/configure ${WRKSRC}/configure
+	@${CP} ${FILESDIR}/freebsdplay.c ${WRKSRC}/config/freebsdplay.c
+	@${CP} ${FILESDIR}/config.guess ${WRKSRC}/config.guess
+	@${CP} ${FILESDIR}/config.sub ${WRKSRC}/config.sub
+	@${CP} ${FILESDIR}/configure ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/audio/s3mod/Makefile b/audio/s3mod/Makefile
index 6c76bcdbf930..d414d543944e 100644
--- a/audio/s3mod/Makefile
+++ b/audio/s3mod/Makefile
@@ -3,15 +3,17 @@
 # Date created:         9 March 1995
 # Whom:                 ugen
 #
-# $Id$
+# $Id: Makefile,v 1.3 1995/04/11 19:46:50 asami Exp $
 #
 
 DISTNAME=       s3mod-v1.08A
 PKGNAME=	s3mod-1.08a
-CATEGORIES+=	audio
+CATEGORIES=	audio
 MASTER_SITES=   ftp://sunsite.unc.edu/pub/Linux/apps/sound/players/
 DISTFILES=      s3mod-v1.08A.tar.gz
 
+MAINTAINER=	ugen@FreeBSD.org
+
 INSTALL_TARGET= install 
 
 .include <bsd.port.mk>
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index b1a8c6f8897e..babb95d97e28 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -3,12 +3,12 @@
 # Date created:		17 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.5 1995/05/05 20:43:47 torstenb Exp $
+# $Id: Makefile,v 1.6 1995/05/05 20:54:27 torstenb Exp $
 #
 
 DISTNAME=	sox10p11
 PKGNAME=	sox-10.11
-CATEGORIES+=	audio
+CATEGORIES=	audio
 MASTER_SITES=	ftp://nic.switch.ch/software/sources/audio/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index 8d2800f5253e..7ca2ecb84fd4 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -3,19 +3,19 @@
 # Date created:         25 Now 1995
 # Whom:                 Donald Burr <d_burr@ix.netcom.com>
 #
-# $Id: Makefile,v 1.1 1995/11/26 09:20:50 root Exp $
+# $Id: Makefile,v 1.1.1.1 1995/11/26 12:47:05 asami Exp $
 #
 
 DISTNAME=       WorkMan-1.3
 PKGNAME=	workman-1.3
-CATEGORIES+=	audio
+CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.x.org/contrib/applications/WorkMan/
 
 MAINTAINER=	d_burr@ix.netcom.com
 
 LIB_DEPENDS=	xview\\.3\\.:${PORTSDIR}/x11/xview-lib
 
-USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/workman
+USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index 8cd1a456580b..5313f4542578 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -3,17 +3,17 @@
 # Date created:         22 November 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.12 1996/11/04 14:42:15 jmz Exp $
+# $Id: Makefile,v 1.13 1996/11/05 13:19:57 asami Exp $
 #
 
 DISTNAME=	xcd-1.5
-CATEGORIES+=	audio
+CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
 
-WRKSRC=		${WRKDIR}/xcd
-
 MAINTAINER=	jmz@FreeBSD.org
 
 RUN_DEPENDS=    wish4.1:${PORTSDIR}/x11/tk41
 
+WRKSRC=		${WRKDIR}/xcd
+
 .include <bsd.port.mk>
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile
index 1a08ac2e72a6..c2d969bff17e 100644
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -3,13 +3,15 @@
 # Date created:         30 Sep 1994
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.5 1995/04/01 12:44:04 jkh Exp $
+# $Id: Makefile,v 1.6 1995/04/11 19:46:57 asami Exp $
 #
 
 DISTNAME=       xcdplayer-2.2
-CATEGORIES+=	audio
+CATEGORIES=	audio
 MASTER_SITES=	ftp://dutepp0.et.tudelft.nl/pub/Unix/Sun/
 
+MAINTAINER=	swallace@FreeBSD.org
+
 USE_IMAKE=      yes
 
 .include <bsd.port.mk>
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 0516cbaf5ac8..184e53a391d6 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -3,11 +3,11 @@
 # Date created:		16 Februar 1995
 # Whom:			Gennady Sorokopud <gena@NetVision.net.il>
 #
-# $Id: Makefile,v 1.3 1995/04/11 19:46:58 asami Exp $
+# $Id: Makefile,v 1.4 1996/04/11 08:46:50 asami Exp $
 #
 
 DISTNAME=	xmcd-2.0
-CATEGORIES+=	audio
+CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.x.org/contrib/applications/xmcd/ \
 		ftp://crl.dec.com/pub/X11/contrib/applications/xmcd/
 
@@ -18,6 +18,6 @@ USE_IMAKE=	yes
 IS_INTERACTIVE=	yes	# asks a lot of questions
 
 post-install:
-	cp ${WRKSRC}/README ${PREFIX}/lib/X11/xmcd
+	${CP} ${WRKSRC}/README ${PREFIX}/lib/X11/xmcd
 
 .include <bsd.port.mk>
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index b489ebe53212..deb8ab8cb045 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -5,7 +5,7 @@
 #
 
 DISTNAME=	xmix-2.1
-CATEGORIES+=	audio
+CATEGORIES=	audio
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/apps/sound/mixers/ \
 		ftp://ftp.icm.edu.pl/pub2/linux/apps/sound/mixers/
 
@@ -13,11 +13,13 @@ PATCH_SITES=	ftp://sunsite.unc.edu/pub/Linux/apps/sound/mixers/ \
 		ftp://ftp.icm.edu.pl/pub2/linux/apps/sound/mixers/
 PATCHFILES=	xmix-2.1.mixers.patch
 
+MAINTAINER=	janek@gaja.ipan.lublin.pl
+
 USE_IMAKE=	yes
 WRKSRC=		$(WRKDIR)/xmix
 
 pre-install:
-	cp ${WRKSRC}/xmix.1 ${WRKSRC}/xmix.man
-	/usr/bin/install -c -m 0444 $(WRKSRC)/XMix /usr/X11R6/lib/X11/app-defaults
+	${CP} ${WRKSRC}/xmix.1 ${WRKSRC}/xmix.man
+	${INSTALL_DATA} $(WRKSRC)/XMix /usr/X11R6/lib/X11/app-defaults
 
 .include <bsd.port.mk>
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index 0583ce85b4b7..98020c14ccd2 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -3,13 +3,15 @@
 # Date created:		Mon Aug  5 10:54:25 CDT 1996
 # Whom:			erich@FreeBSD.org
 #
-# $Id$
+# $Id: Makefile,v 1.2 1996/08/19 11:01:53 asami Exp $
 #
 
 DISTNAME=	xmmix-1.2
-CATEGORIES+=	audio
+CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.x.org/contrib/applications/xmmix/
 
+MAINTAINER=	erich@FreeBSD.org
+
 USE_IMAKE=	yes
 REQUIRES_MOTIF=	yes