head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.48 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.46 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.44 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.42 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.40 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.38 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.36 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.34 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.32 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.30 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.28 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.26 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.24 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.22 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.20 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.18 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.16 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.14 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.12 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.10 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.8 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.6 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.4 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.2 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.7.0.2 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.6.0.12 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.10 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.6.0.6 netbsd-1-6-1-base:1.6 netbsd-1-6:1.6.0.8 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.6 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.3 netbsd-1-3-PATCH003:1.3; locks; strict; comment @# @; 1.8 date 2004.06.26.18.27.23; author grant; state dead; branches; next 1.7; 1.7 date 2004.04.24.00.49.45; author wiz; state Exp; branches; next 1.6; 1.6 date 2001.08.06.15.00.31; author tron; state Exp; branches; next 1.5; 1.5 date 2001.08.02.13.28.47; author jlam; state Exp; branches; next 1.4; 1.4 date 2001.07.01.22.00.53; author jlam; state Exp; branches; next 1.3; 1.3 date 98.08.07.10.40.49; author agc; state Exp; branches; next 1.2; 1.2 date 98.07.26.14.36.43; author tv; state Exp; branches; next 1.1; 1.1 date 98.07.14.19.29.28; author tv; state Exp; branches; next ; desc @@ 1.8 log @move mpeg-lib to multimedia/ @ text @$NetBSD: patch-ap,v 1.7 2004/04/24 00:49:45 wiz Exp $ --- Makefile.in.orig Thu Nov 26 17:03:29 1998 +++ Makefile.in Mon Aug 6 16:54:52 2001 @@@@ -11,7 +11,7 @@@@ EXTRA_CFLAGS = @@EXTRA_CFLAGS@@ INCLUDE_DIRS = -I. @@INCLUDE_DIRS@@ DEFINES = @@DEFINES@@ -CFLAGS = $(OPTIMIZE) $(EXTRA_CFLAGS) +CFLAGS += $(OPTIMIZE) $(EXTRA_CFLAGS) CPPFLAGS = $(INCLUDE_DIRS) $(DEFINES) # Installation directories (and install program) @@@@ -41,14 +41,14 @@@@ # Other files of interest -LIBRARY = libmpeg.a +LIBRARY = libmpeg_lib.la SHLIB = libmpeg.so HEADER = mpeg.h EXTRAS = @@extras@@ # Implicit targets .c.o: - $(CC) -c $(CFLAGS) $(CPPFLAGS) $< + ${LIBTOOL} --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS) $< # Library/cleanup targets: @@@@ -60,16 +60,18 @@@@ shlib: $(SHLIB) $(LIBRARY): $(LIBOBJ) - $(AR) $(ARFLAGS) $(LIBRARY) $(LIBOBJ) - $(RANLIB) $(LIBRARY) + ${LIBTOOL} --mode=link $(CC) -o $(LIBRARY) $(LIBOBJ:.o=.lo) \ + -rpath ${PREFIX}/lib -version-info 1:3 + $(SHLIB): $(LIBOBJ) $(CC) -shared -o $(SHLIB) $(LIBOBJ) install: $(LIBRARY) - $(INSTALL) -d $(INSTALL_INCLUDE) $(INSTALL_LIBRARY) + $(INSTALL) -d $(INSTALL_INCLUDE) + $(INSTALL) -d $(INSTALL_LIBRARY) $(INSTALL) -m 0644 $(HEADER) $(INSTALL_INCLUDE)/$(HEADER) - $(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY) + ${LIBTOOL} --mode=install $(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 clean: @ 1.7 log @Convert to bl3. While here, add --mode options to libtool lines (in patch). @ text @d1 1 a1 1 $NetBSD: patch-ap,v 1.6 2001/08/06 15:00:31 tron Exp $ @ 1.6 log @Create directories one by one because Solaris's "/usr/ucb/install" command doesn't like multiple directory names in conjuction with "-d" option. @ text @d1 1 a1 1 $NetBSD$ d27 1 a27 1 + ${LIBTOOL} $(CC) -c $(CFLAGS) $(CPPFLAGS) $< d37 1 a37 1 + ${LIBTOOL} $(CC) -o $(LIBRARY) $(LIBOBJ:.o=.lo) \ d50 1 a50 1 + ${LIBTOOL} $(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY) @ 1.5 log @Update mpeg-lib to 1.3.1. The only relevant changes from version 1.2.1 are "some small, but glaring, bug fixes". Also add a HOMEPAGE to the package. Most of the changes to the files in the patches directory are just fuzz- or offset-related. Change the name of the installed library from libmpeg to libmpeg_lib to avoid conflicting with audio/kdemultimedia2 (pkg/13589 by Matthias Scheler ). @ text @d3 2 a4 2 --- Makefile.in.orig Thu Nov 26 11:03:29 1998 +++ Makefile.in d31 1 a31 1 @@@@ -60,8 +60,9 @@@@ d43 1 a43 1 @@@@ -69,7 +70,7 @@@@ d45 3 a47 1 $(INSTALL) -d $(INSTALL_INCLUDE) $(INSTALL_LIBRARY) @ 1.4 log @Honor CFLAGS passed in from environment during build. @ text @d3 1 a3 1 --- Makefile.in.orig Mon Feb 26 13:12:54 1996 d5 7 a11 1 @@@@ -6,11 +6,11 @@@@ d13 2 a14 13 # Various programs and their options -CC = @@CC@@ +CC = ${LIBTOOL} @@CC@@ OPT = @@OPT@@ DEFS = @@DEFS@@ INCLUDES = -I. -CFLAGS = $(OPT) $(DEFS) $(INCLUDES) +CFLAGS += $(OPT) $(DEFS) $(INCLUDES) AR = @@AR@@ ARFLAGS = ru RANLIB = @@RANLIB@@ @@@@ -31,7 +31,7 @@@@ d19 10 a28 2 +LIBRARY = libmpeg.la MPEGTEST = mpegtest d30 3 a32 3 # Targets for all platforms @@@@ -39,8 +39,8 @@@@ all: $(LIBRARY) @@extras@@ d37 13 a49 4 + ${CC} -o ${LIBRARY} ${LIBOBJ:.o=.lo} -rpath ${PREFIX}/lib \ + -version-info 1:2 $(LIBOBJ): Makefile d51 1 @ 1.3 log @Add NetBSD RCS Ids. @ text @d4 2 a5 2 +++ Makefile.in Sun Jul 26 10:25:54 1998 @@@@ -6,7 +6,7 @@@@ d14 5 @ 1.2 log @- Get the dependencies right: the library is libmpeg.la, so actually tell make that we're building libmpeg.la. - Don't try to call libtool with an argument of libtool; just let libtool detect the compile or link mode automagically. @ text @d1 2 @ 1.1 log @Update to use libtool, and kill the NetBSD-style Makefile. No more PLIST discrepancies vs. mk.conf. @ text @d1 2 a2 2 --- Makefile.in.orig Tue Jul 14 15:08:58 1998 +++ Makefile.in Tue Jul 14 15:12:56 1998 d8 1 a8 1 +CC = ${LIBTOOL} --mode=compile @@CC@@ d12 7 a18 1 @@@@ -36,11 +36,12 @@@@ d21 2 a22 3 -all: $(LIBRARY) @@extras@@ +all: $(LIBRARY) d27 1 a27 2 + ${LIBTOOL} --mode=link ${CC} -o ${LIBRARY:.a=.la} \ + ${LIBOBJ:.o=.lo} -rpath ${PREFIX}/lib \ @