- remove license type

- replace patch-aa with the use of MAKE_FLAGS
- use better filenames for patches

audio/gqmpeg/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2000/07/28 23:36:00 jakob Exp $
+# $OpenBSD: Makefile,v 1.13 2000/08/18 20:38:50 brad Exp $
 # Original from: Bruno Rohée
 
 DISTNAME=	gqmpeg-0.6.3.src
@@ -7,33 +7,32 @@ CATEGORIES=     audio
 NEED_VERSION=	1.230
 MASTER_SITES=	http://www.netpedia.net/hosting/gqview/packages/
 
+LIB_DEPENDS=	gdk_imlib.19::graphics/imlib
+BUILD_DEPENDS=	mpg123::audio/mpg123
+RUN_DEPENDS=	mpg123::audio/mpg123
+
 HOMEPAGE=	http://www.netpedia.net/hosting/gqview/mpeg-index.html
 
 MAINTAINER=	rohee@openbsd.org
 
-LICENSE_TYPE=		GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-LIB_DEPENDS=	glib.1.2::devel/glib \
-		gtk.1.2::x11/gtk+ \
-		gdk_imlib.19::graphics/imlib
-BUILD_DEPENDS=	mpg123::audio/mpg123
-RUN_DEPENDS=	mpg123::audio/mpg123
+MAKE_FLAGS=	PREFIX="${PREFIX}" CC="${CC}" \
+		CFLAGS='${CFLAGS} -Wall $$(GTK_INCLUDE) $$(IMLIB_INCLUDE)'
 
 ALL_TARGET=	gqmpeg
+
 WRKDIST=	${WRKDIR}/${PKGNAME}
 
-DOCS=	COPYING FAQ README SKIN-SPECS ChangeLog
+DOCS=	COPYING ChangeLog FAQ README SKIN-SPECS
 
 do-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gqmpeg
 	${INSTALL_PROGRAM} ${WRKSRC}/gqmpeg ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/plugin/gqmpeg-shoutcast-plugin.sh ${PREFIX}/bin
-.for f in ${DOCS}
-	${INSTALL_DATA}	${WRKSRC}/${f} ${PREFIX}/share/doc/gqmpeg
-.endfor
+	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/gqmpeg
 
 .include <bsd.port.mk>

audio/gqmpeg/patches/patch-aa

@@ -1,25 +0,0 @@
---- Makefile.orig	Mon Dec  6 08:30:43 1999
-+++ Makefile	Mon Dec  6 08:31:26 1999
-@@ -1,12 +1,9 @@
--
--PREFIX=/usr/local
--
- GTK_INCLUDE = `gtk-config --cflags`
- GTK_LIB = `gtk-config --libs`
- IMLIB_INCLUDE = `imlib-config --cflags-gdk`
- IMLIB_LIB = `imlib-config --libs-gdk`
- 
--CFLAGS += $(GTK_INCLUDE) $(IMLIB_INCLUDE)
-+CFLAGS += -Wall $(GTK_INCLUDE) $(IMLIB_INCLUDE)
- LDFLAGS = $(GTK_LIB) $(IMLIB_LIB)
- 
- #The following commented out lines are for replacing the stock defines on
-@@ -15,7 +12,7 @@
- #for IRIX
- #LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) -laudio
- 
--CC = gcc -Wall
-+#CC = gcc -Wall
- 
- GNOME_PREFIX = `gnome-config --prefix`
-