Update to mpgtx-1.3. OK'd by wiz@. Closes PR pkg/19082.

30 August 2002 (Version 1.3):
 [pb]   -Added support and fixes for mpeg2 muxed files. mpgtx should now split and join mpeg2 files correct
 [pb]   - Improved mpgtx knowledge about length of mpeg2 movies
 [pb]   - removed bug which was introduced in 1.2 where demuxing was broken

18 August 2002 (Version 1.2):
 [pb]   - mpgtx is now able to search for a valid pack through a whole file (-X)
 [pb]   - added option to suppress progress output (faster) (-N)
 [pb]   - fixed a bug where a buffer is at end and data could not be processed -> unplayable movies
 [pb]   - increased file buffer for better performace to 2MB
 [pb]   - added option to change the aspect ratio of a movie (-A )
 [pb]   - added option to keep junk headers in splits (-P)

27 August 2001:
 [la]   - mpgtx now supports MPEG streams with leading zeros and skip them gracefully
 [la]   - added some support for ill-formed system streams that don't begin with a PACK
          header.
          (both, thank to Søren Roug)

22 August 2001:
 [la]   - Created a home made configure script that automagically checks
          Large File support and GCC 3.0 tricks to produce correct CFLAGS
          and LFLAGS.

20 August 2001:
 [la]   - Restored compatibility for systems older than glibc2.2+
          to enable large file support build with `make lfs-support'

10 August 2001: (large file support)
 [ms]   - support for files larger than 2GB on systems supporting Single UNIX
          Specification 2.0. Requires glibc2.1+ for build but actual support
          requires both glibc2.2+ and Linux kernel 2.4+
 [la]   - Cosmetic changes
          (The Entire Large File Support code is the courtesy of Mattias Sandgren
           Please stand up and applause )

6  August 2001
 [la]   - tagmp3 used to return 1 even on success. changed that so that it could be
          used in scripts.
          (A big thank to C. R. Johnson for that.)

4 files changed, 73 insertions, 78 deletions

diff --git a/graphics/mpgtx/Makefile b/graphics/mpgtx/Makefile
index 2224dfac5f4..74fbf2c73fc 100644
--- a/graphics/mpgtx/Makefile
+++ b/graphics/mpgtx/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:41:50 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/10/11 14:59:58 cube Exp $
 #
 
-DISTNAME=	mpgtx-1.0-1-src
-PKGNAME=	mpgtx-1.0
-WRKSRC=		${WRKDIR}/mpgtx-1.0
+DISTNAME=	mpgtx-1.3
 CATEGORIES=	audio graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpgtx/}
 EXTRACT_SUFX=	.tgz
@@ -12,4 +10,9 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://mpgtx.sourceforge.net/
 COMMENT=	Split and join MPEG files in various ways
 
+HAS_CONFIGURE=	yes
+
+CONFIGURE_ARGS+=	--prefix=${PREFIX}	\
+			--manprefix=${PREFIX}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mpgtx/distinfo b/graphics/mpgtx/distinfo
index 319c74965f3..dfc0212b50b 100644
--- a/graphics/mpgtx/distinfo
+++ b/graphics/mpgtx/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/17 11:39:35 grant Exp $
+$NetBSD: distinfo,v 1.2 2003/10/11 14:59:58 cube Exp $
 
-SHA1 (mpgtx-1.0-1-src.tgz) = 677f7c09d876ad0429d42b06ca001a9034a69ac9
-Size (mpgtx-1.0-1-src.tgz) = 70063 bytes
-SHA1 (patch-aa) = 45812e7ad44f3815a696105365c4903456c7c50e
+SHA1 (mpgtx-1.3.tgz) = 34b35e347a111826d531eb837ae88d95eaf2f745
+Size (mpgtx-1.3.tgz) = 76471 bytes
+SHA1 (patch-ab) = c7031b2cda4122c3cf123b7c2402332c92b9e513
diff --git a/graphics/mpgtx/patches/patch-aa b/graphics/mpgtx/patches/patch-aa
deleted file mode 100644
index 8fbceb100df..00000000000
--- a/graphics/mpgtx/patches/patch-aa
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/17 11:39:35 grant Exp $
-
---- Makefile.orig	Mon Jul 23 12:30:24 2001
-+++ Makefile
-@@ -1,5 +1,4 @@
- # installation dirs : Edit at your convenance
--PREFIX=/usr
- INSTALLDIR=$(PREFIX)/bin
- MANDIR=$(PREFIX)/man/man1
- 
-@@ -12,19 +11,19 @@
- STATIC_LFLAGS= -static -s
- DEVEL_LFLAGS= #-lefence
- 
--default : devel
-+all : shared
- 
- # here are the default targets
- nocatch:
--	make mpgtx 'CFLAGS=$(DEVEL_CFLAGS) -DNOSIGNAL_H' 'LFLAGS=$(DEVEL_LFLAGS)'
-+	$(MAKE) mpgtx 'CFLAGS=$(DEVEL_CFLAGS) -DNOSIGNAL_H' 'LFLAGS=$(DEVEL_LFLAGS)'
- debug:
--	make mpgtx 'CFLAGS=$(DEVEL_CFLAGS) -D_DEBUG_' 'LFLAGS=$(DEVEL_LFLAGS)'
-+	$(MAKE) mpgtx 'CFLAGS=$(DEVEL_CFLAGS) -D_DEBUG_' 'LFLAGS=$(DEVEL_LFLAGS)'
- devel:	
--	make mpgtx 'CFLAGS=$(DEVEL_CFLAGS)' 'LFLAGS=$(DEVEL_LFLAGS)'
-+	$(MAKE) mpgtx 'CFLAGS=$(DEVEL_CFLAGS)' 'LFLAGS=$(DEVEL_LFLAGS)'
- shared:
--	make mpgtx 'CFLAGS=$(RELEASE_CFLAGS)' 'LFLAGS=$(SHARED_LFLAGS)'
-+	$(MAKE) mpgtx 'CFLAGS=$(RELEASE_CFLAGS)' 'LFLAGS=$(SHARED_LFLAGS)'
- static:
--	make mpgtx 'CFLAGS=$(RELEASE_CFLAGS)' 'LFLAGS=$(STATIC_LFLAGS)'
-+	$(MAKE) mpgtx 'CFLAGS=$(RELEASE_CFLAGS)' 'LFLAGS=$(STATIC_LFLAGS)'
- 
- 
- 
-@@ -42,20 +41,19 @@
- 	rm -f *.o mpgtx mpgjoin mpgcat mpgsplit mpginfo mpgdemux tagmp3 man/mpginfo.1 man/mpgsplit.1 man/mpgcat.1 man/mpgjoin.1 man/mpgdemux.1
- 
- install: 
--	ln -sf mpgtx mpgjoin  
--	ln -sf mpgtx mpgsplit 
--	ln -sf mpgtx mpgcat   
--	ln -sf mpgtx mpginfo  
--	ln -sf mpgtx mpgdemux
--	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) 
--	cd man ; make
--	cd ..
--	cp -df   ./man/mpgdemux.1 ./man/mpgjoin.1 man/mpgsplit.1 man/mpgcat.1 man/mpginfo.1 $(MANDIR)
-+	$(BSD_INSTALL_PROGRAM) mpgtx $(INSTALLDIR)
-+	$(BSD_INSTALL) -l sr $(INSTALLDIR)/mpgtx $(INSTALLDIR)/mpgjoin
-+	$(BSD_INSTALL) -l sr $(INSTALLDIR)/mpgtx $(INSTALLDIR)/mpgsplit
-+	$(BSD_INSTALL) -l sr $(INSTALLDIR)/mpgtx $(INSTALLDIR)/mpgcat
-+	$(BSD_INSTALL) -l sr $(INSTALLDIR)/mpgtx $(INSTALLDIR)/mpginfo
-+	$(BSD_INSTALL) -l sr $(INSTALLDIR)/mpgtx $(INSTALLDIR)/mpgdemux
-+	$(BSD_INSTALL) -l sr $(INSTALLDIR)/mpgtx $(INSTALLDIR)/tagmp3
-+	$(BSD_INSTALL_MAN) man/mpgtx.1 man/tagmp3.1 $(MANDIR) 
-+	$(BSD_INSTALL) -l h $(MANDIR)/mpgtx.1 $(MANDIR)/mpgdemux.1
-+	$(BSD_INSTALL) -l h $(MANDIR)/mpgtx.1 $(MANDIR)/mpgjoin.1
-+	$(BSD_INSTALL) -l h $(MANDIR)/mpgtx.1 $(MANDIR)/mpgsplit.1
-+	$(BSD_INSTALL) -l h $(MANDIR)/mpgtx.1 $(MANDIR)/mpgcat.1
-+	$(BSD_INSTALL) -l h $(MANDIR)/mpgtx.1 $(MANDIR)/mpginfo.1
- 
- uninstall:
- 	rm -f 	$(INSTALLDIR)/mpgtx     
diff --git a/graphics/mpgtx/patches/patch-ab b/graphics/mpgtx/patches/patch-ab
new file mode 100644
index 00000000000..5f3a29a17aa
--- /dev/null
+++ b/graphics/mpgtx/patches/patch-ab
@@ -0,0 +1,62 @@
+$NetBSD: patch-ab,v 1.1 2003/10/11 14:59:58 cube Exp $
+
+--- configure.orig	2002-08-30 18:03:12.000000000 +0200
++++ configure
+@@ -76,6 +76,7 @@ do 
+ 	 -stat | -static | --stat | --static) static="yes";;
+ 	 -par | -parachute | --par | --parachute) parachute="yes";;
+ 	 -prefix=* | --prefix=*) prefix=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++	 -manprefix=* | --manprefix=*) manprefix=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ 	 -dist | dist | --distrib | -distrib) rm -f Makefile && cat << EOF >makefile && exit 0;;
+ # Dummy Makefile, please run ./configure	 
+ default:
+@@ -134,7 +135,7 @@ done
+ # gcc 3 does not seem to like -O3 with mpgtx very much 
+ 
+ # next line is from Chris Danis
+-gcc_major=`gcc --version | cut -b 1`
++gcc_major=`gcc -dumpversion | cut -b 1`
+ 
+ if test $gcc_major = "3"; then
+ 	optimization_cflags="-O2";
+@@ -243,7 +244,7 @@ cat << EOF >>$makefilename
+ 
+ # Now onto the targets
+ 
+-default: warn mpgtx
++all: warn mpgtx
+ 	@echo "----------------------------------------------------------------------"
+ 	@echo "Success building mpgtx. Now type \"make install\" to install it"
+ 	@echo "----------------------------------------------------------------------"	
+@@ -293,21 +294,16 @@ clean :
+ 
+ 
+ install: 
+-	ln -sf mpgtx mpgjoin  
+-	ln -sf mpgtx mpgsplit 
+-	ln -sf mpgtx mpgcat   
+-	ln -sf mpgtx mpginfo  
+-	ln -sf mpgtx mpgdemux
+-	ln -sf mpgtx tagmp3
+-	install -d -m 755  \$(INSTALLDIR)
+-	install -d -m 755  \$(MANDIR)
+-	install -s -m 755 mpgtx \$(INSTALLDIR)
+-	cp -\$(cpflags)f mpgdemux mpgjoin mpgcat mpginfo mpgsplit tagmp3 \$(INSTALLDIR)
+-	install -m 644 man/mpgtx.1 man/tagmp3.1 \$(MANDIR) 
+-	cd man ; make
+-	cd ..
+-	cp -\$(cpflags)f ./man/mpgdemux.1 ./man/mpgjoin.1 man/mpgsplit.1 man/mpgcat.1 man/mpginfo.1 \$(MANDIR)
+-
++	\$(BSD_INSTALL_PROGRAM) mpgtx \$(INSTALLDIR)
++	for prog in mpgjoin mpgsplit mpgcat mpginfo mpgdemux tagmp3 ;	\\
++	do								\\
++	    ln -sf mpgtx \$(INSTALLDIR)/\$\$prog ;			\\
++	done ;
++	\$(BSD_INSTALL_MAN) man/mpgtx.1 man/tagmp3.1 \$(MANDIR)
++	for prog in mpgjoin mpgsplit mpgcat mpginfo mpgdemux ;		\\
++	do								\\
++	    ln -f \$(MANDIR)/mpgtx.1 \$(MANDIR)/\$\$prog.1 ;		\\
++	done ;
+ 
+ uninstall:
+ 	rm -f   \$(INSTALLDIR)/mpgtx