From f6523f9fae9fdd46dfd81d77a089d73f2eec86c4 Mon Sep 17 00:00:00 2001
From: steve <steve@FreeBSD.org>
Date: Thu, 23 Dec 1999 16:14:45 +0000
Subject: * Removed unneeded lines from Makefile * Fixed install options *
 Fixed pkg/PLIST

PR:		15223
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
---
 graphics/mpeg-lib/Makefile       |  6 ++----
 graphics/mpeg-lib/files/patch-aa | 22 +++++++++++++++-------
 graphics/mpeg-lib/pkg-plist      |  4 ++--
 3 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'graphics/mpeg-lib')

diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index 6d53423..0665a13 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -8,16 +8,14 @@
 
 DISTNAME=	mpeg_lib-1.3.1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.bic.mni.mcgill.ca/pub/mpeg/
+MASTER_SITES=	ftp://ftp.bic.mni.mcgill.ca/pub/mpeg/ \
+		http://starship.python.net/~gward/mpeglib/
 
 MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OPTIMIZE="${CFLAGS}"
 
-pre-install:
-	@${MKDIR} ${PREFIX}/bin ${PREFIX}/lib ${PREFIX}/include
-
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
diff --git a/graphics/mpeg-lib/files/patch-aa b/graphics/mpeg-lib/files/patch-aa
index 8c92080..018ef00 100644
--- a/graphics/mpeg-lib/files/patch-aa
+++ b/graphics/mpeg-lib/files/patch-aa
@@ -1,6 +1,14 @@
 --- Makefile.in.orig	Fri Nov 27 01:03:29 1998
-+++ Makefile.in	Tue Aug 31 23:11:56 1999
-@@ -26,6 +26,7 @@
++++ Makefile.in	Tue Nov 23 02:51:05 1999
+@@ -19,13 +19,14 @@
+ exec_prefix     = @exec_prefix@
+ INSTALL_INCLUDE = @includedir@
+ INSTALL_LIBRARY = @libdir@
+-INSTALL         = @INSTALL@
++INSTALL_DATA    = @INSTALL_DATA@
+ 
+ # Other miscellaneous programs
+ AR            = @AR@
  ARFLAGS       = -ru
  RANLIB        = @RANLIB@
  
@@ -20,7 +28,7 @@
  LIBRARY       = libmpeg.a
 -SHLIB         = libmpeg.so
 +.if ${PORTOBJFORMAT} == elf
-+SHLIB	        = libmpeg.so.1
++SHLIB         = libmpeg.so.1
 +.else
 +SHLIB         = libmpeg.so.1.3
 +.endif
@@ -57,9 +65,9 @@
 +		ln -sf $(SHLIB) `echo $(SHLIB) | sed 's/\.so.*$$/\.so/'` 
 +
 +install:
-+		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
++		$(INSTALL_DATA) $(LIBRARY) $(SHLIB) $(INSTALL_LIBRARY)
++		(cd $(INSTALL_LIBRARY); ln -sf $(SHLIB) `echo $(SHLIB) | sed 's/\.so.*$$/\.so/'`)
++		$(INSTALL_DATA) $(HEADER) $(INSTALL_INCLUDE)
  
  clean:
  		rm -f $(LIBRARY) $(EXTRAS) $(LIBOBJ) core
@@ -68,7 +76,7 @@
  		cd extras && $(MAKE) distclean
  
 +.c.so:
-+		${CC} ${CFLAGS} $(INCLUDE_DIRS) -fpic -DPIC -c $< -o $@
++		$(CC) $(CFLAGS) $(INCLUDE_DIRS) -fpic -DPIC -c $< -o $@
  
  # Executable targets (mpegtest, easympeg [GL platforms only])
  
diff --git a/graphics/mpeg-lib/pkg-plist b/graphics/mpeg-lib/pkg-plist
index 3903b69..ad1a50a 100644
--- a/graphics/mpeg-lib/pkg-plist
+++ b/graphics/mpeg-lib/pkg-plist
@@ -1,6 +1,6 @@
+include/mpeg.h
 lib/libmpeg.a
-lib/libmpeg.so.1.3
 lib/libmpeg.so
+lib/libmpeg.so.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-include/mpeg.h
-- 
cgit v1.1