Update to version 1.3.1.

PR:		13529
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

7 files changed, 77 insertions, 141 deletions

diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index eccb218bf9a5..d065da714010 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -1,20 +1,18 @@
 # New ports collection makefile for:	mpeg_lib
-# Version required:	1.1
+# Version required:	1.3.1
 # Date created:		16 November 1994
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mpeg_lib-1.2.1
+DISTNAME=	mpeg_lib-1.3.1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.mni.mcgill.ca/pub/mpeg/
+MASTER_SITES=	ftp://ftp.bic.mni.mcgill.ca/pub/mpeg/
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/mpeg_lib
-
-GNU_CONFIGURE= yup
+GNU_CONFIGURE=	yes
 
 pre-install:
 	@${MKDIR} ${PREFIX}/bin ${PREFIX}/lib ${PREFIX}/include
diff --git a/graphics/mpeg-lib/distinfo b/graphics/mpeg-lib/distinfo
index 65cef81288ab..2dc287d9d0af 100644
--- a/graphics/mpeg-lib/distinfo
+++ b/graphics/mpeg-lib/distinfo
@@ -1 +1 @@
-MD5 (mpeg_lib-1.2.1.tar.gz) = 28d9d7a80031393d1008e0dff76c4674
+MD5 (mpeg_lib-1.3.1.tar.gz) = 9d803be0073f42acf87d5fbb339a183b
diff --git a/graphics/mpeg-lib/files/patch-aa b/graphics/mpeg-lib/files/patch-aa
index 737e72f9c198..8c9208001a5c 100644
--- a/graphics/mpeg-lib/files/patch-aa
+++ b/graphics/mpeg-lib/files/patch-aa
@@ -1,23 +1,14 @@
---- Makefile.in.orig	Tue Feb 27 04:42:54 1996
-+++ Makefile.in	Sat Apr 10 21:23:36 1999
-@@ -7,7 +7,7 @@
- # Various programs and their options
- 
- CC            = @CC@
--OPT           = @OPT@
-+OPT           = @CFLAGS@
- DEFS          = @DEFS@
- INCLUDES      = -I.
- CFLAGS        = $(OPT) $(DEFS) $(INCLUDES)
-@@ -16,6 +16,7 @@
+--- Makefile.in.orig	Fri Nov 27 01:03:29 1998
++++ Makefile.in	Tue Aug 31 23:11:56 1999
+@@ -26,6 +26,7 @@
+ ARFLAGS       = -ru
  RANLIB        = @RANLIB@
- SHELL         = /bin/sh
  
 +.SUFFIXES: .so
  
  # Source for the library itself -- note that we define LIBSRC and
  # LIBOBJ this way (instead of just LIBOBJ=$(LIBSRC:.c=.o) because
-@@ -27,23 +28,42 @@
+@@ -37,12 +38,17 @@
  		mono.c ordered.c ordered2.c mb_ordered.c
  LIBSRC        = @libsrc@
  LIBOBJ        = @libobj@
@@ -27,47 +18,57 @@
  # Other files of interest
  
  LIBRARY       = libmpeg.a
+-SHLIB         = libmpeg.so
 +.if ${PORTOBJFORMAT} == elf
-+SHLIBRARY	  = libmpeg.so.1
++SHLIB	        = libmpeg.so.1
 +.else
-+SHLIBRARY	  = libmpeg.so.1.2
++SHLIB         = libmpeg.so.1.3
 +.endif
- MPEGTEST      = mpegtest
+ HEADER        = mpeg.h
+ EXTRAS        = @extras@
+ 
+@@ -53,7 +59,7 @@
  
- # Targets for all platforms
+ # Library/cleanup targets: 
  
--all:		$(LIBRARY) @extras@
-+all:		$(LIBRARY) ${SHLIBRARY} @extras@
+-all:		lib $(EXTRAS)
++all:		lib shlib $(EXTRAS)
  
- $(LIBRARY):	$(LIBOBJ)
+ lib:		$(LIBRARY)
+ 
+@@ -63,14 +69,18 @@
  		$(AR) $(ARFLAGS) $(LIBRARY) $(LIBOBJ)
  		$(RANLIB) $(LIBRARY)
  
-+$(SHLIBRARY):	$(SHLIBOBJ)
+-$(SHLIB):	$(LIBOBJ)
+-		$(CC) -shared -o $(SHLIB) $(LIBOBJ)
+-
+-install:	$(LIBRARY)
+-		$(INSTALL) -d $(INSTALL_INCLUDE) $(INSTALL_LIBRARY)
+-		$(INSTALL) -m 0644 $(HEADER) $(INSTALL_INCLUDE)/$(HEADER)
+-		$(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY)
+-		@if test -f $(SHLIB) ; then echo "warning: $(SHLIB) *not* installed (installing shared libraries is too system-specific)" ; fi
++$(SHLIB):	$(SHLIBOBJ)
 +.if ${PORTOBJFORMAT} == elf
-+		cc -shared -Wl,-soname,$(SHLIBRARY) -o $(SHLIBRARY) $(SHLIBOBJ)
++		$(CC) -shared -Wl,-soname,$(SHLIB) -o $(SHLIB) $(SHLIBOBJ)
 +.else
-+		cc -shared -o $(SHLIBRARY) $(SHLIBOBJ)
++		$(CC) -shared -o $(SHLIB) $(SHLIBOBJ)
 +.endif
-+		ln -sf $(SHLIBRARY) `echo $(SHLIBRARY) | sed 's/\.so.*$$/.so/'`
++		ln -sf $(SHLIB) `echo $(SHLIB) | sed 's/\.so.*$$/\.so/'` 
 +
- $(LIBOBJ):	Makefile
- 
 +install:
-+	install -c -m 444 ${LIBRARY} ${SHLIBRARY} ${PREFIX}/lib
-+	(cd ${PREFIX}/lib;ln -sf $(SHLIBRARY) `echo $(SHLIBRARY) | sed 's/\.so.*$$/.so/'`)
-+	install -c -m 444 mpeg.h ${PREFIX}/include
-+
- @Makefile_extras@
++		install -c -m 444 ${LIBRARY} ${SHLIB} ${PREFIX}/lib
++		(cd ${PREFIX}/lib; ln -sf $(SHLIB) `echo $(SHLIB) | sed 's/\.so.*$$/\.so/'`)
++		install -c -m 444 mpeg.h ${PREFIX}/include
  
  clean:
-@@ -53,6 +73,9 @@
- distclean: clean
+ 		rm -f $(LIBRARY) $(EXTRAS) $(LIBOBJ) core
+@@ -80,6 +90,8 @@
  		rm -f config.cache config.log config.status Makefile config.h
  		cd extras && $(MAKE) distclean
-+
+ 
 +.c.so:
-+	${CC} ${CFLAGS} -fpic -DPIC -c $< -o $@
++		${CC} ${CFLAGS} $(INCLUDE_DIRS) -fpic -DPIC -c $< -o $@
  
- # Include a system-specific Makefile fragment, if any
+ # Executable targets (mpegtest, easympeg [GL platforms only])
  
diff --git a/graphics/mpeg-lib/files/patch-ab b/graphics/mpeg-lib/files/patch-ab
index 8ec1acae84de..2d416905821e 100644
--- a/graphics/mpeg-lib/files/patch-ab
+++ b/graphics/mpeg-lib/files/patch-ab
@@ -1,27 +1,23 @@
-*** video.c.orig	Wed Nov 16 13:43:47 1994
---- video.c	Wed Nov 16 13:34:42 1994
-***************
-*** 39,44 ****
---- 39,48 ----
-  #include "util.h"
-  #include "proto.h"
-  
-+ #ifdef _HAVE_PARAM_H
-+ #include <sys/param.h>
-+ #endif
-+ 
-  /* Declarations of functions. */
-  static void ReconIMBlock();
-  static void ReconPMBlock();
-***************
-*** 435,441 ****
---- 439,447 ----
-    static int num_calls = 0;
-    unsigned int data;
-    int i, status;
-+ #if BSD < 199103
-    long int ftell (FILE *stream);
-+ #endif
-  
-    /* If vid_stream is null, create new VidStream structure. */
-  
+--- video.c.orig	Sat Jul 24 13:00:51 1999
++++ video.c	Tue Aug 31 23:11:56 1999
+@@ -49,6 +49,10 @@
+ #include "proto.h"
+ #include "my_dmalloc.h"
+ 
++#ifdef _HAVE_PARAM_H
++#include <sys/param.h>
++#endif
++
+ /* Declarations of functions. */
+ static void ReconIMBlock(VidStream *,int);
+ static void ReconPMBlock(VidStream *,int,int,int,int);
+@@ -445,7 +449,9 @@
+   static int num_calls = 0;
+   unsigned int data;
+   int i, status;
++#if BSD < 199103
+   long int ftell (FILE *stream);
++#endif
+ 
+   /* If vid_stream is null, create new VidStream structure. */
+ 
diff --git a/graphics/mpeg-lib/files/patch-ad b/graphics/mpeg-lib/files/patch-ad
index eca05f698c15..363235268656 100644
--- a/graphics/mpeg-lib/files/patch-ad
+++ b/graphics/mpeg-lib/files/patch-ad
@@ -1,67 +1,6 @@
---- configure.orig	Sat Apr 10 21:32:10 1999
-+++ configure	Sat Apr 10 21:32:13 1999
-@@ -521,7 +521,7 @@
- # sure it supports prototypes, void, and enums properly (can't trust
- # __STDC__).
- 
--CFLAGS=$OPT
-+CFLAGS=$CFLAGS
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-@@ -700,51 +700,6 @@
-   fi
- fi
-   
--# See how high an optimization level (up to -O6) the compiler will 
--# let us go.  This is skipped if $opt_level is already set (eg.
--# by the NeXT-detector code above) because the NeXT cc dies, but 
--# doesn't return an error code if run with an illegal -O option!
--
--if test -z "$opt_level" ; then
--  echo $ac_n "checking highest available optimization level""... $ac_c" 1>&6
--  opt_level=""
--  if eval "test \"`echo '$''{'mpeg_cv_opt_level'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  
--  for opt in "-O" "-O2" "-O3" "-O4" "-O5" "-O6"; do
--    CFLAGS="$OPT$opt"
--    cat > conftest.$ac_ext <<EOF
--#line 719 "configure"
--#include "confdefs.h"
--
--int main() { return 0; }
--int t() {
--
--; return 0; }
--EOF
--if eval $ac_compile; then
--  rm -rf conftest*
--  mpeg_cv_opt_level=$opt
--fi
--rm -f conftest*
--
--  done
--  
--fi
--
--  opt_level=$mpeg_cv_opt_level
--  if  test -z $opt_level ; then
--    { echo "configure: error: your compiler is broken" 1>&2; exit 1; }
--  fi
--
--  echo "$ac_t""$opt_level" 1>&6
--fi
--OPT="$OPT$opt_level"
--
--
--CFLAGS="$OPT $DEFS"      # this is the final, real assigment to CFLAGS!
--
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-@@ -817,6 +772,7 @@
+--- configure.orig	Mon Aug  9 09:36:05 1999
++++ configure	Tue Aug 31 23:11:56 1999
+@@ -1101,6 +1101,7 @@
  if test $dither = yes; then
    libsrc='$(DECODER_SRC) $(DITHER_SRC)'
    libobj='$(DECODER_SRC:.c=.o) $(DITHER_SRC:.c=.o)'
@@ -69,7 +8,7 @@
    cat >> confdefs.h <<\EOF
  #define ENABLE_DITHER 1
  EOF
-@@ -825,6 +781,7 @@
+@@ -1109,6 +1110,7 @@
  else
    libsrc='$(DECODER_SRC)'
    libobj='$(DECODER_SRC:.c=.o)'
@@ -77,11 +16,11 @@
    cat >> confdefs.h <<\EOF
  #define ENABLE_DITHER 0
  EOF
-@@ -1459,6 +1416,7 @@
+@@ -1818,6 +1820,7 @@
  s%@AR@%$AR%g
  s%@libsrc@%$libsrc%g
  s%@libobj@%$libobj%g
 +s%@shlibobj@%$shlibobj%g
- s%@jrevdct@%$jrevdct%g
- s%@extras@%$extras%g
- /@Makefile_extras@/r $Makefile_extras
+ s%@CPP@%$CPP%g
+ 
+ CEOF
diff --git a/graphics/mpeg-lib/pkg-descr b/graphics/mpeg-lib/pkg-descr
index 7c6d4e25b07b..fe4d027d3bea 100644
--- a/graphics/mpeg-lib/pkg-descr
+++ b/graphics/mpeg-lib/pkg-descr
@@ -8,3 +8,5 @@ Neurological Institute in May/June 1994 to facilitate the development
 of an MPEG player specifically for Silicon Graphics workstations; the
 decoding engine together with the MNI front end constitute the MPEG
 Library.
+
+WWW: http://starship.python.net/~gward/mpeglib/
diff --git a/graphics/mpeg-lib/pkg-plist b/graphics/mpeg-lib/pkg-plist
index c74d5e5b370b..3903b69745b2 100644
--- a/graphics/mpeg-lib/pkg-plist
+++ b/graphics/mpeg-lib/pkg-plist
@@ -1,5 +1,5 @@
 lib/libmpeg.a
-lib/libmpeg.so.1.2
+lib/libmpeg.so.1.3
 lib/libmpeg.so
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R