4 files changed, 18 insertions, 25 deletions

diff --git a/multimedia/oqtencoder/Makefile b/multimedia/oqtencoder/Makefile
index fe01f0152d7a..691c6797d1f2 100644
--- a/multimedia/oqtencoder/Makefile
+++ b/multimedia/oqtencoder/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 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
@@ -19,20 +19,27 @@ COMMENT=	A simple encoder using OpenQuicktime (TM)
 
 LIB_DEPENDS=	openquicktime.0:${PORTSDIR}/multimedia/openquicktime
 
-MAKE_ENV=	SDL_CONFIG=${SDL_CONFIG}
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-USE_PERL5_BUILD=yes
+USE_REINPLACE=	yes
+MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+PLIST_FILES=	bin/oqtencoder
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	README
+.endif
 
 post-patch:
-	@${PERL} -pi -e "s/
//" ${WRKSRC}/readme
+	@${TR} -d '\r' < ${WRKSRC}/readme > ${WRKSRC}/README
+	@${REINPLACE_CMD} -e 's|gcc -g|${CC}|g' ${WRKSRC}/Makefile
 
 do-install:
-.ifndef(NOPORTDOCS)
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME:L} ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/readme ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME:L} ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/multimedia/oqtencoder/distinfo b/multimedia/oqtencoder/distinfo
index b2040def2895..9c4a0cea1803 100644
--- a/multimedia/oqtencoder/distinfo
+++ b/multimedia/oqtencoder/distinfo
@@ -1,2 +1,2 @@
-MD5 (oqtencoder-0.1.tgz) = 9e4e3c5eb87e106144dff52dcb6c8ccd
-SIZE (oqtencoder-0.1.tgz) = 3778
+MD5 (oqtencoder-0.1-src.tgz) = 9e4e3c5eb87e106144dff52dcb6c8ccd
+SIZE (oqtencoder-0.1-src.tgz) = 3778
diff --git a/multimedia/oqtencoder/files/patch-Makefile b/multimedia/oqtencoder/files/patch-Makefile
deleted file mode 100644
index a6dc80c571d8..000000000000
--- a/multimedia/oqtencoder/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Mon Sep 24 20:53:00 2001
-+++ Makefile	Mon Sep 24 20:53:21 2001
-@@ -2,7 +2,7 @@
- all: oqtencoder
- 
- oqtencoder: oqtencoder.c
--	gcc -g -o oqtencoder oqtencoder.c -lopenquicktime $(CFLAGS) $(LDFLAGS)
-+	$(CC) -o oqtencoder oqtencoder.c -I$(LOCALBASE)/include -L$(LOCALBASE)/lib -lopenquicktime $(CFLAGS) $(LDFLAGS)
- 
- clean:
- 	rm -f *~
diff --git a/multimedia/oqtencoder/pkg-plist b/multimedia/oqtencoder/pkg-plist
deleted file mode 100644
index 6a0496d6fb4d..000000000000
--- a/multimedia/oqtencoder/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/oqtencoder
-%%PORTDOCS%%share/doc/OQTEncoder/readme
-%%PORTDOCS%%@dirrm share/doc/OQTEncoder