- Update to 1.7, unbreak and adopt

9 files changed, 161 insertions, 69 deletions

diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index 16bd62b40eba..5fcf9c5e9399 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: libmpeg3
+# New ports collection makefile for:	libmpeg3
 # Date created:		06 Feb 2005
 # Whom:			Igor Pokrovsky <ip@doom.homeunix.org>
 #
@@ -6,41 +6,41 @@
 #
 
 PORTNAME=	libmpeg3
-PORTVERSION=	1.5.4
+PORTVERSION=	1.7
+DISTVERSIONSUFFIX=	-src
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	heroines
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Advanced editing and manipulation of MPEG streams
 
-BROKEN=		fails to compile
+BUILD_DEPENSD=	nasm:${PORTSDIR}/devel/nasm
+LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
+		a52.0:${PORTSDIR}/audio/liba52
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GCC=	3.4
+USE_GCC=	3.4+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+NASM?=		${LOCALBASE}/bin/nasm
+MAKE_ENV=	NASM=${NASM} INSTALL=${INSTALL} ARCH=${ARCH} PTHREAD_LIBS=${PTHREAD_LIBS}
+
+PORTDOCS=	index.html
+MPEG3_UTILS=	mpeg3cat mpeg3dump mpeg3peek mpeg3toc
+PLIST_FILES=	${MPEG3_UTILS:S,^,bin/,} include/libmpeg3.h include/mpeg3private.h lib/libmpeg3.a
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|" \
-		${WRKSRC}/Makefile
-	@(${FIND} ${WRKSRC} -name '*.[ch]' \
-		| ${XARGS} ${REINPLACE_CMD} -i '' -e 's|stdint\.h|sys\/types\.h|g')
-	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' \
-		${WRKSRC}/a52dec-0.7.3/libao/audio_out_oss.c
+	@${FIND} ${WRKSRC} -name '*.[ch]' -print0 \
+		| ${XARGS} -0 ${REINPLACE_CMD} -e 's|stdint\.h|sys/types.h|g'
 
 do-install:
-.for i in mpeg3cat mpeg3dump mpeg3toc
-	${INSTALL_PROGRAM} ${WRKSRC}/${MACHINE_ARCH}/${i} ${PREFIX}/bin
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/${MACHINE_ARCH}/libmpeg3.a ${PREFIX}/lib
-.for i in libmpeg3.h mpeg3private.h
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/include
-.endfor
+	${INSTALL_PROGRAM} ${MPEG3_UTILS:S,^,${WRKSRC}/${ARCH}/,} ${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/${ARCH}/libmpeg3.a ${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/libmpeg3.h ${WRKSRC}/mpeg3private.h ${PREFIX}/include/
 .ifndef (NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/index.html ${DOCSDIR}
+	${INSTALL} -d ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/index.html ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/libmpeg3/distinfo b/multimedia/libmpeg3/distinfo
index 8ea39fd25295..0b0d994d7ff2 100644
--- a/multimedia/libmpeg3/distinfo
+++ b/multimedia/libmpeg3/distinfo
@@ -1,3 +1,3 @@
-MD5 (libmpeg3-1.5.4-src.tar.bz2) = 7adfc9c0beea2134575137f2e0d2ef11
-SHA256 (libmpeg3-1.5.4-src.tar.bz2) = 80908ebef37a4b4db705bcb044d82c68d22a5812c418f178411166ef2fbe259d
-SIZE (libmpeg3-1.5.4-src.tar.bz2) = 626205
+MD5 (libmpeg3-1.7-src.tar.bz2) = 4a3e8896164d59d7d0dff69b50b75352
+SHA256 (libmpeg3-1.7-src.tar.bz2) = b9e840ab489fd57860d305cdfb43d2c25fbb01105c4db4e16f09122727ee052d
+SIZE (libmpeg3-1.7-src.tar.bz2) = 320897
diff --git a/multimedia/libmpeg3/files/patch-Makefile b/multimedia/libmpeg3/files/patch-Makefile
index 7f6e2a564727..58f8376ec014 100644
--- a/multimedia/libmpeg3/files/patch-Makefile
+++ b/multimedia/libmpeg3/files/patch-Makefile
@@ -1,26 +1,39 @@
---- Makefile.orig	Wed Oct 29 10:53:02 2003
-+++ Makefile	Tue Feb  8 23:57:49 2005
-@@ -1,7 +1,7 @@
+--- ./Makefile.orig	Wed Feb 15 08:09:31 2006
++++ ./Makefile	Sat Jul 22 18:10:38 2006
+@@ -1,13 +1,6 @@
 -CC = gcc
 -NASM = nasm
-+#CC = gcc
-+#NASM = nasm
  USE_MMX = 0
 -USE_CSS = 1
+-A52DIR := $(shell expr a52dec* )
+-
 +USE_CSS = 0
- A52DIR := $(shell expr a52dec* )
  
+-ifeq ("$(PREFIX)", "")
+-PREFIX=/usr
+-endif
  
-@@ -13,7 +13,7 @@
+ ifeq ($(origin CFLAGS), environment)
+ HAVE_CFLAGS := y
+@@ -16,7 +9,7 @@
  endif
  
  
 -OBJDIR := $(shell uname --machine)
-+OBJDIR := $(shell uname -p)
++OBJDIR := $(ARCH)
  
  
  
-@@ -33,7 +33,7 @@
+@@ -28,7 +21,7 @@
+   endif
+ endif
+ 
+-ifeq ($(OBJDIR), i686)
++ifeq ($(OBJDIR), i386)
+   USE_MMX = 1
+   ifneq ($(HAVE_CFLAGS), y)
+     CFLAGS := -O2 -fomit-frame-pointer -falign-loops=2 -falign-jumps=2 -falign-functions=2 -I/usr/local/include
+@@ -36,13 +29,11 @@
    CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
  endif
  
@@ -29,12 +42,94 @@
    ifneq ($(HAVE_CFLAGS), y)
      CFLAGS := -O2 -fomit-frame-pointer -I/usr/local/include
    endif
-@@ -138,7 +138,7 @@
+   CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+-
+-
+ endif
+ 
+ 
+@@ -64,22 +55,10 @@
+ 
+ CFLAGS += \
+ 	-I. \
+-	-I$(A52DIR)/include \
+-	-I$(A52DIR)/liba52
+-
+-
++	-I$(LOCALBASE)/include/a52dec
+ 
+ CFLAGS += -g
+ 
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ OBJS = \
+ 	$(OBJDIR)/audio/ac3.o \
+ 	$(OBJDIR)/audio/dct.o \
+@@ -136,30 +115,30 @@
+ 	$(OBJDIR)/audio \
+ 	$(OBJDIR)/video
+ 
+-include Makefile.a52
+-
+-DIRS += $(A52DIRS)
+-
+-
+ OUTPUT = $(OBJDIR)/libmpeg3.a
+ UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3peek $(OBJDIR)/mpeg3toc  $(OBJDIR)/mpeg3cat
+ 
  #$(OBJDIR)/mpeg3split
  
  
 -LIBS = -lm -lpthread
-+LIBS = -lm %%PTHREAD_LIBS%%
++LIBS = -lm -la52 $(PTHREAD_LIBS) -L${LOCALBASE}/lib
+ 
+-$(shell if ! test -d $(OBJDIR) \; then mkdir -p $(OBJDIR) \; fi )
++#$(shell if ! test -d $(OBJDIR) ; then mkdir -p $(OBJDIR) ; fi )
+ 
+-$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
+-$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags)
+-$(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)
+-$(shell mkdir -p $(DIRS) )
++#$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
++#$(shell echo $(OBJS) $(ASMOBJS) $(NASMOBJS) > $(OBJDIR)/objs)
++#$(shell mkdir -p $(DIRS) )
+ 
+-all: $(OUTPUT) $(UTILS)
++all: SHELL $(OUTPUT) $(UTILS)
++
++SHELL:
++	$(INSTALL) -d $(OBJDIR)
++	echo $(CFLAGS) > $(OBJDIR)/c_flags
++	echo $(OBJS) $(ASMOBJS) $(NASMOBJS) > $(OBJDIR)/objs
++	$(INSTALL) -d $(DIRS)
+ 
+ 
+-$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)
++$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS)
+ 	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
+ 
  
- $(shell if ! test -d $(OBJDIR) \; then mkdir -p $(OBJDIR) \; fi )
+@@ -211,8 +190,6 @@
+ 	$(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.S) -o $*.o
+ $(NASMOBJS): 
+ 	$(NASM) -f elf $(subst $(OBJDIR)/,, $*.s) -o $*.o
+-$(A52OBJS):
+-	$(CC) -c `cat $(OBJDIR)/a52_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
  
+ $(OBJDIR)/libmpeg3.o: 				    libmpeg3.c
+ $(OBJDIR)/mpeg3atrack.o: 			    mpeg3atrack.c
+@@ -256,7 +233,3 @@
+ $(OBJDIR)/video/subtitle.o:                         video/subtitle.c
+ $(OBJDIR)/video/vlc.o:  			    video/vlc.c
+ $(OBJDIR)/workarounds.o:  			    workarounds.c
+-
+-
+-
+-include depend.a52
diff --git a/multimedia/libmpeg3/files/patch-a52dec-0.7.3_include_config.h b/multimedia/libmpeg3/files/patch-a52dec-0.7.3_include_config.h
deleted file mode 100644
index ee5a4cb539de..000000000000
--- a/multimedia/libmpeg3/files/patch-a52dec-0.7.3_include_config.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- a52dec-0.7.3/include/config.h.orig
-+++ a52dec-0.7.3/include/config.h
-@@ -17,7 +17,7 @@
- /* #undef HAVE_IO_H */
- 
- /* Define if you have the `memalign' function. */
--#define HAVE_MEMALIGN 1
-+/*#define HAVE_MEMALIGN 1*/
- 
- /* Define if you have the <memory.h> header file. */
- #define HAVE_MEMORY_H 1
diff --git a/multimedia/libmpeg3/files/patch-ifo.h b/multimedia/libmpeg3/files/patch-ifo.h
index b1ef929dd60c..5f3775b92a06 100644
--- a/multimedia/libmpeg3/files/patch-ifo.h
+++ b/multimedia/libmpeg3/files/patch-ifo.h
@@ -1,5 +1,5 @@
---- ifo.h.orig
-+++ ifo.h
+--- ./ifo.h.orig	Thu Apr 21 07:59:43 2005
++++ ./ifo.h	Sat Jul 22 18:02:04 2006
 @@ -15,6 +15,8 @@
  #define IFO_OFFSET_SUBPIC	0x0250
  
diff --git a/multimedia/libmpeg3/files/patch-mpeg3ifo.c b/multimedia/libmpeg3/files/patch-mpeg3ifo.c
index 5ac86df3b2cc..dfa4507fc3bc 100644
--- a/multimedia/libmpeg3/files/patch-mpeg3ifo.c
+++ b/multimedia/libmpeg3/files/patch-mpeg3ifo.c
@@ -1,5 +1,5 @@
---- mpeg3ifo.c.orig
-+++ mpeg3ifo.c
+--- ./mpeg3ifo.c.orig	Sun Feb 19 01:19:23 2006
++++ ./mpeg3ifo.c	Sat Jul 22 18:02:04 2006
 @@ -1,4 +1,4 @@
 -#include <byteswap.h>
 +//#include <byteswap.h>
diff --git a/multimedia/libmpeg3/files/patch-mpeg3io.c b/multimedia/libmpeg3/files/patch-mpeg3io.c
index 82fd6f1f32c6..7d9ffb48d376 100644
--- a/multimedia/libmpeg3/files/patch-mpeg3io.c
+++ b/multimedia/libmpeg3/files/patch-mpeg3io.c
@@ -1,14 +1,16 @@
---- mpeg3io.c.orig
-+++ mpeg3io.c
-@@ -1,7 +1,7 @@
+--- ./mpeg3io.c.orig	Sun May  1 09:57:56 2005
++++ ./mpeg3io.c	Sat Jul 22 18:02:04 2006
+@@ -1,8 +1,8 @@
  #include "mpeg3private.h"
  #include "mpeg3protos.h"
  
 -#include <mntent.h>
+-#include <stdint.h>
 +#include <fstab.h>
- #include <stdint.h>
++#include <sys/types.h>
  #include <stdlib.h>
  #include <string.h>
+ #include <sys/stat.h>
 @@ -35,8 +35,8 @@
  
  int64_t mpeg3io_get_total_bytes(mpeg3_fs_t *fs)
@@ -40,25 +42,25 @@
  	{
  		perror("mpeg3io_open_file");
  		return 1;
-@@ -157,7 +157,7 @@
- 		if(remainder)
- 			memmove(fs->buffer + remainder_start, fs->buffer, remainder);
+@@ -161,7 +161,7 @@
+ 
+ 
  
 -		fseeko64(fs->fd, new_buffer_position, SEEK_SET);
 +		fseek(fs->fd, new_buffer_position, SEEK_SET);
  		fread(fs->buffer, 1, remainder_start, fs->fd);
  
  
-@@ -172,7 +172,7 @@
+@@ -176,7 +176,7 @@
  		fs->buffer_position = fs->current_byte;
  		fs->buffer_offset = 0;
  
 -		result = fseeko64(fs->fd, fs->buffer_position, SEEK_SET);
 +		result = fseek(fs->fd, fs->buffer_position, SEEK_SET);
+ //printf("mpeg3io_read_buffer 2 %llx %llx\n", fs->buffer_position, ftell(fs->fd));
  		fs->buffer_size = fread(fs->buffer, 1, MPEG3_IO_SIZE, fs->fd);
  
- 
-@@ -210,27 +210,27 @@
+@@ -215,27 +215,27 @@
  
  int mpeg3io_device(char *path, char *device)
  {
diff --git a/multimedia/libmpeg3/files/patch-mpeg3tocutil.c b/multimedia/libmpeg3/files/patch-mpeg3tocutil.c
new file mode 100644
index 000000000000..4e3e1783e2dd
--- /dev/null
+++ b/multimedia/libmpeg3/files/patch-mpeg3tocutil.c
@@ -0,0 +1,14 @@
+--- ./mpeg3tocutil.c.orig	Fri Jun  9 09:58:27 2006
++++ ./mpeg3tocutil.c	Sat Jul 22 18:02:04 2006
+@@ -1415,8 +1415,8 @@
+ 
+ int64_t mpeg3_calculate_source_date(char *path)
+ {
+-	struct stat64 ostat;
+-	bzero(&ostat, sizeof(struct stat64));
+-	stat64(path, &ostat);
++	struct stat ostat;
++	bzero(&ostat, sizeof(struct stat));
++	stat(path, &ostat);
+ 	return ostat.st_mtime;
+ }
diff --git a/multimedia/libmpeg3/pkg-plist b/multimedia/libmpeg3/pkg-plist
deleted file mode 100644
index 883baee58e94..000000000000
--- a/multimedia/libmpeg3/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/mpeg3cat
-bin/mpeg3dump
-bin/mpeg3toc
-include/libmpeg3.h
-include/mpeg3private.h
-lib/libmpeg3.a
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%