4 files changed, 29 insertions, 56 deletions

diff --git a/multimedia/mpgtx/Makefile b/multimedia/mpgtx/Makefile
index 5bedd326c4ee..ce4c6ea7aefb 100644
--- a/multimedia/mpgtx/Makefile
+++ b/multimedia/mpgtx/Makefile
@@ -7,34 +7,39 @@
 #
 
 PORTNAME=	mpgtx
-PORTVERSION=	1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1-src
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-ALL_TARGET=	shared
-MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_MAN="${INSTALL_MAN}"
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX}
+ALL_TARGET=	default
 
 MAN1=	mpgtx.1 tagmp3.1
-MLINKS=	mpgtx.1 mpgdemux.1 \
+MLINKS=	mpgtx.1 mpgcat.1 \
+	mpgtx.1 mpgdemux.1 \
+	mpgtx.1 mpginfo.1 \
 	mpgtx.1 mpgjoin.1 \
-	mpgtx.1 mpgsplit.1 \
-	mpgtx.1 mpgcat.1 \
-	mpgtx.1 mpginfo.1
-
-post-install:
-	@(cd ${PREFIX}/bin ; \
-	${LN} -sf mpgtx mpgdemux ; \
-	${LN} -sf mpgtx mpgjoin ; \
-	${LN} -sf mpgtx mpgsplit ; \
-	${LN} -sf mpgtx mpgcat ; \
-	${LN} -sf mpgtx mpginfo ; \
-	${LN} -sf mpgtx tagmp3)
+	mpgtx.1 mpgsplit.1
+
+pre-patch:
+	@${PERL} -pi -e 's|CFLAGS=|CFLAGS\+=|g ; \
+		 s|\$$cflags \$$optimization_cflags|\$$cflags|g ; \
+		 s|g\+\+|${CXX}|g' ${WRKSRC}/configure
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/mpgtx ${PREFIX}/bin
+.for link in mpgcat mpgdemux mpginfo mpgjoin mpgsplit tagmp3
+	${LN} -sf mpgtx ${PREFIX}/bin/${link}
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/man/mpgtx.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/tagmp3.1 ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/multimedia/mpgtx/distinfo b/multimedia/mpgtx/distinfo
index 52e7a588ec5f..1b4fd4bdd4ba 100644
--- a/multimedia/mpgtx/distinfo
+++ b/multimedia/mpgtx/distinfo
@@ -1 +1 @@
-MD5 (mpgtx-1.0-1-src.tgz) = 9a1b92a651b2c63abf6f6439a8462724
+MD5 (mpgtx-1.1-1-src.tgz) = 684b94b5e971855c4a73a214f940f47f
diff --git a/multimedia/mpgtx/files/patch-Makefile b/multimedia/mpgtx/files/patch-Makefile
index c4493077521a..e69de29bb2d1 100644
--- a/multimedia/mpgtx/files/patch-Makefile
+++ b/multimedia/mpgtx/files/patch-Makefile
@@ -1,32 +0,0 @@
---- Makefile.orig	Tue Jul 24 15:39:59 2001
-+++ Makefile	Tue Jul 24 15:41:13 2001
-@@ -1,5 +1,4 @@
- # installation dirs : Edit at your convenance
--PREFIX=/usr
- INSTALLDIR=$(PREFIX)/bin
- MANDIR=$(PREFIX)/man/man1
- 
-@@ -7,7 +6,7 @@
- 
- # compilation flags
- DEVEL_CFLAGS= -g  -Wall -Werror -pedantic -fno-builtin
--RELEASE_CFLAGS= -Wall -g -O2 -pedantic 
-+RELEASE_CFLAGS= ${CFLAGS}
- SHARED_LFLAGS= -s
- STATIC_LFLAGS= -static -s
- DEVEL_LFLAGS= #-lefence
-@@ -50,12 +49,10 @@
- 	ln -sf mpgtx tagmp3
- 	install -d -m 755  $(INSTALLDIR)
- 	install -d -m 755  $(MANDIR)
--	install -s -m 755 mpgtx $(INSTALLDIR)
--	cp  -df   mpgdemux mpgjoin mpgcat mpginfo mpgsplit tagmp3 $(INSTALLDIR)
--	install -m 644 man/mpgtx.1 man/tagmp3.1 $(MANDIR) 
-+	${INSTALL_PROGRAM} mpgtx $(INSTALLDIR)
-+	${INSTALL_MAN} man/mpgtx.1 man/tagmp3.1 $(MANDIR) 
- 	cd man ; make
- 	cd ..
--	cp -df   ./man/mpgdemux.1 ./man/mpgjoin.1 man/mpgsplit.1 man/mpgcat.1 man/mpginfo.1 $(MANDIR)
- 
- uninstall:
- 	rm -f 	$(INSTALLDIR)/mpgtx     
diff --git a/multimedia/mpgtx/pkg-plist b/multimedia/mpgtx/pkg-plist
index 72c07a4ec81a..534a00fda73b 100644
--- a/multimedia/mpgtx/pkg-plist
+++ b/multimedia/mpgtx/pkg-plist
@@ -1,7 +1,7 @@
-bin/mpgtx
-bin/mpgjoin
-bin/mpgsplit
 bin/mpgcat
-bin/mpginfo
 bin/mpgdemux
+bin/mpginfo
+bin/mpgjoin
+bin/mpgsplit
+bin/mpgtx
 bin/tagmp3