- Fix DISTNAME.

- Remove pkg-plist in favor of PLIST_FILES.
- Global cleaning of the port.

PR:		ports/81727
Submitted by:	Ports Fury

4 files changed, 21 insertions, 24 deletions

diff --git a/multimedia/oqtplayer/Makefile b/multimedia/oqtplayer/Makefile
index 716d52d7768b..c7e4e225e14f 100644
--- a/multimedia/oqtplayer/Makefile
+++ b/multimedia/oqtplayer/Makefile
@@ -11,25 +11,36 @@ PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openquicktime
-DISTNAME=	${PORTNAME:L}-${PORTVERSION}
+DISTNAME=	${PORTNAME:L}-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A very very small, not functionnal, video OpenQuicktime (TM) player
 
-LIB_DEPENDS=    openquicktime.0:${PORTSDIR}/multimedia/openquicktime
+LIB_DEPENDS=	openquicktime.0:${PORTSDIR}/multimedia/openquicktime
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_SDL=	sdl
-MAKE_ENV=	SDL_CONFIG=${SDL_CONFIG}
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_REINPLACE=	yes
+MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+PLIST_FILES=	bin/oqtplayer
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	readme
+.endif
 
-CFLAGS+=	-I${LOCALBASE}/include
+post-patch:
+	@${REINPLACE_CMD} -e 's|gcc -g|${CC}|g ; \
+		 s|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile
 
 do-install:
-.ifndef(NOPORTDOCS)
+	${INSTALL_PROGRAM} ${WRKSRC}/oqtplayer ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/readme ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme ${DOCSDIR}
 .endif
-	@${INSTALL_PROGRAM} ${WRKSRC}/oqtplayer ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/multimedia/oqtplayer/distinfo b/multimedia/oqtplayer/distinfo
index 9bce8889c9cc..0b9e5ee400bb 100644
--- a/multimedia/oqtplayer/distinfo
+++ b/multimedia/oqtplayer/distinfo
@@ -1,2 +1,2 @@
-MD5 (oqtplayer-0.5.tgz) = 692f5a43e3f7a7819f65bd9f92f3d858
-SIZE (oqtplayer-0.5.tgz) = 8953
+MD5 (oqtplayer-0.5-src.tgz) = 692f5a43e3f7a7819f65bd9f92f3d858
+SIZE (oqtplayer-0.5-src.tgz) = 8953
diff --git a/multimedia/oqtplayer/files/patch-Makefile b/multimedia/oqtplayer/files/patch-Makefile
deleted file mode 100644
index 3e0305bf64be..000000000000
--- a/multimedia/oqtplayer/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Mon Sep 24 19:43:59 2001
-+++ Makefile	Mon Sep 24 19:45:20 2001
-@@ -2,7 +2,7 @@
- all: oqtplayer
- 
- oqtplayer: oqtplayer.c
--	gcc -g -o oqtplayer oqtplayer.c -lopenquicktime `sdl-config --cflags` `sdl-config --libs` $(CFLAGS) $(LDFLAGS)
-+	$(CC) -o oqtplayer oqtplayer.c -lopenquicktime `$(SDL_CONFIG) --cflags` `$(SDL_CONFIG) --libs` $(CFLAGS) $(LDFLAGS)
- 
- clean:
- 	rm -f *~
diff --git a/multimedia/oqtplayer/pkg-plist b/multimedia/oqtplayer/pkg-plist
deleted file mode 100644
index 36ae4b804811..000000000000
--- a/multimedia/oqtplayer/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/oqtplayer
-%%PORTDOCS%%share/doc/OQTPlayer/readme
-%%PORTDOCS%%@dirrm share/doc/OQTPlayer