From owner-freebsd-ports  Thu Dec  2 10:12:17 1999
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id AA85814D2D
	for <freebsd-ports@FreeBSD.org>; Thu,  2 Dec 1999 10:12:02 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id KAA20091;
	Thu, 2 Dec 1999 10:10:01 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 546F614D09; Thu,  2 Dec 1999 10:02:02 -0800 (PST)
Message-Id: <19991202180202.546F614D09@hub.freebsd.org>
Date: Thu,  2 Dec 1999 10:02:02 -0800 (PST)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@freebsd.org
X-Send-Pr-Version: www-1.0
Subject: ports/15223: Update port: audio/mpeg-lib
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         15223
>Category:       ports
>Synopsis:       Update port: audio/mpeg-lib
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec  2 10:10:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        3.3-RELEASE i386
>Organization:
>Environment:
>Description:
* Removed unneeded lines from Makefile
* Fixed install options
* Fixed pkg/PLIST

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/graphics/mpeg-lib/Makefile graphics/mpeg-lib/Makefile
--- /usr/ports/graphics/mpeg-lib/Makefile	Sat Nov 27 05:37:45 1999
+++ graphics/mpeg-lib/Makefile	Sun Nov 28 17:24:54 1999
@@ -8,15 +8,13 @@
 
 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 -urN /usr/ports/graphics/mpeg-lib/patches/patch-aa graphics/mpeg-lib/patches/patch-aa
--- /usr/ports/graphics/mpeg-lib/patches/patch-aa	Sun Sep 19 21:05:47 1999
+++ graphics/mpeg-lib/patches/patch-aa	Sun Nov 28 17:59:10 1999
@@ -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 -urN /usr/ports/graphics/mpeg-lib/pkg/PLIST graphics/mpeg-lib/pkg/PLIST
--- /usr/ports/graphics/mpeg-lib/pkg/PLIST	Sun Sep 19 21:05:48 1999
+++ graphics/mpeg-lib/pkg/PLIST	Sun Nov 28 17:25:43 1999
@@ -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


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message