diff options
-rw-r--r-- | graphics/mpeg-lib/Makefile | 17 | ||||
-rw-r--r-- | graphics/mpeg-lib/files/Makefile | 14 | ||||
-rw-r--r-- | graphics/mpeg-lib/files/Makefile.NetBSD | 1 | ||||
-rw-r--r-- | graphics/mpeg-lib/files/shlib_version | 4 | ||||
-rw-r--r-- | graphics/mpeg-lib/patches/patch-ap | 27 | ||||
-rw-r--r-- | graphics/mpeg-lib/pkg/PLIST | 7 |
6 files changed, 38 insertions, 32 deletions
diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile index 021d1d8ee23..fda6df71050 100644 --- a/graphics/mpeg-lib/Makefile +++ b/graphics/mpeg-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/07/10 17:56:30 tv Exp $ +# $NetBSD: Makefile,v 1.8 1998/07/14 19:29:27 tv Exp $ DISTNAME= mpeg_lib-1.2.1 PKGNAME= mpeg-1.2.1 @@ -9,16 +9,17 @@ MASTER_SITES= ftp://ftp.mni.mcgill.ca/pub/mpeg/ \ MAINTAINER= tron@netbsd.org +BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool + GNU_CONFIGURE= yes +MAKE_ENV= LIBTOOL=${PREFIX}/bin/libtool WRKSRC= ${WRKDIR}/mpeg_lib -post-configure: - ln -fs ${FILESDIR}/Makefile ${WRKSRC} - ln -s ${FILESDIR}/shlib_version ${WRKSRC} - -post-install: - (cd ${WRKSRC};make PREFIX=${PREFIX} includes) - ${LDCONFIG} || ${TRUE} +do-install: + cd ${WRKSRC} && \ + ${PREFIX}/bin/libtool --mode=install ${INSTALL_DATA} \ + libmpeg.la ${PREFIX}/lib/ + ${INSTALL_DATA} ${WRKSRC}/mpeg.h ${PREFIX}/include/ .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mpeg-lib/files/Makefile b/graphics/mpeg-lib/files/Makefile deleted file mode 100644 index e09af8f26e5..00000000000 --- a/graphics/mpeg-lib/files/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: Makefile,v 1.1 1997/12/13 19:48:14 agc Exp $ - -LIB= mpeg -LIBDIR= ${PREFIX}/lib -CPPFLAGS+= -DHAVE_CONFIG_H -I. - -INCS= mpeg.h -INCSDIR= ${PREFIX}/include - -SRCS= util.c video.c parseblock.c motionvector.c decoders.c jrevdct.c\ - wrapper.c globals.c 24bit.c gdith.c fs2.c fs2fast.c fs4.c hybrid.c\ - hybriderr.c 2x2.c gray.c mono.c ordered.c ordered2.c mb_ordered.c - -.include <bsd.lib.mk> diff --git a/graphics/mpeg-lib/files/Makefile.NetBSD b/graphics/mpeg-lib/files/Makefile.NetBSD deleted file mode 100644 index 561f8737e75..00000000000 --- a/graphics/mpeg-lib/files/Makefile.NetBSD +++ /dev/null @@ -1 +0,0 @@ -.include <bsd.lib.mk> diff --git a/graphics/mpeg-lib/files/shlib_version b/graphics/mpeg-lib/files/shlib_version deleted file mode 100644 index 95709bb22b2..00000000000 --- a/graphics/mpeg-lib/files/shlib_version +++ /dev/null @@ -1,4 +0,0 @@ -# $NetBSD: shlib_version,v 1.1 1997/12/13 19:48:16 agc Exp $ -# -major=1 -minor=2 diff --git a/graphics/mpeg-lib/patches/patch-ap b/graphics/mpeg-lib/patches/patch-ap new file mode 100644 index 00000000000..5d457574449 --- /dev/null +++ b/graphics/mpeg-lib/patches/patch-ap @@ -0,0 +1,27 @@ +--- Makefile.in.orig Tue Jul 14 15:08:58 1998 ++++ Makefile.in Tue Jul 14 15:12:56 1998 +@@ -6,7 +6,7 @@ + + # Various programs and their options + +-CC = @CC@ ++CC = ${LIBTOOL} --mode=compile @CC@ + OPT = @OPT@ + DEFS = @DEFS@ + INCLUDES = -I. +@@ -36,11 +36,12 @@ + + # Targets for all platforms + +-all: $(LIBRARY) @extras@ ++all: $(LIBRARY) + + $(LIBRARY): $(LIBOBJ) +- $(AR) $(ARFLAGS) $(LIBRARY) $(LIBOBJ) +- $(RANLIB) $(LIBRARY) ++ ${LIBTOOL} --mode=link ${CC} -o ${LIBRARY:.a=.la} \ ++ ${LIBOBJ:.o=.lo} -rpath ${PREFIX}/lib \ ++ -version-info 1:2 + + $(LIBOBJ): Makefile + diff --git a/graphics/mpeg-lib/pkg/PLIST b/graphics/mpeg-lib/pkg/PLIST index 0893880abcd..e989c49e586 100644 --- a/graphics/mpeg-lib/pkg/PLIST +++ b/graphics/mpeg-lib/pkg/PLIST @@ -1,8 +1,5 @@ -@comment $NetBSD: PLIST,v 1.3 1998/02/02 09:00:01 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.4 1998/07/14 19:29:28 tv Exp $ lib/libmpeg.a -lib/libmpeg_p.a -lib/libmpeg_pic.a +lib/libmpeg.la lib/libmpeg.so.1.2 -@exec /sbin/ldconfig || /usr/bin/true -@unexec /sbin/ldconfig || /usr/bin/true include/mpeg.h |