From 5cab7a8ec3a662caea016656a95b89d4c54067ac Mon Sep 17 00:00:00 2001 From: steven Date: Mon, 26 Dec 2005 18:02:44 +0000 Subject: [PATCH] SHARED_LIBS --- graphics/mpeg-lib/Makefile | 7 ++++++- graphics/mpeg-lib/patches/patch-Makefile_in | 20 +++++++++----------- graphics/mpeg-lib/pkg/PFRAG.shared | 4 ++-- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile index 534b1b1e78f..416850bef17 100644 --- a/graphics/mpeg-lib/Makefile +++ b/graphics/mpeg-lib/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.27 2005/10/30 00:10:41 fgsch Exp $ +# $OpenBSD: Makefile,v 1.28 2005/12/26 18:02:44 steven Exp $ COMMENT= "collection of C routines to decode MPEG movies" DISTNAME= mpeg_lib-1.3.1 PKGNAME= ${DISTNAME:S/_/-/}p0 +SHARED_LIBS= mpeg 13.1 CATEGORIES= graphics # BSD @@ -18,6 +19,10 @@ MASTER_SITES= ftp://ftp.bic.mni.mcgill.ca/pub/mpeg/ \ CONFIGURE_STYLE= gnu CONFIGURE_ENV= OPTIMIZE="${CFLAGS}" +MAKE_FLAGS= SHLIB=libmpeg.so.${LIBmpeg_VERSION} +FAKE_FLAGS= SHLIB=libmpeg.so.${LIBmpeg_VERSION} \ + ${DESTDIRNAME}=${WRKINST} + do-regress: @cd ${WRKSRC} && env LD_LIBRARY_PATH=${WRKSRC} ./mpegtest -checksum test.mpg diff --git a/graphics/mpeg-lib/patches/patch-Makefile_in b/graphics/mpeg-lib/patches/patch-Makefile_in index fcefbb94b94..acb7a3d512c 100644 --- a/graphics/mpeg-lib/patches/patch-Makefile_in +++ b/graphics/mpeg-lib/patches/patch-Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile_in,v 1.1 2004/06/22 03:07:17 brad Exp $ ---- Makefile.in.orig 1998-11-26 09:03:29.000000000 -0700 -+++ Makefile.in 2004-06-21 20:04:38.000000000 -0600 +$OpenBSD: patch-Makefile_in,v 1.2 2005/12/26 18:02:44 steven Exp $ +--- Makefile.in.orig Thu Nov 26 17:03:29 1998 ++++ Makefile.in Mon Dec 26 18:59:52 2005 @@ -15,11 +15,13 @@ CFLAGS = $(OPTIMIZE) $(EXTRA_CFLA CPPFLAGS = $(INCLUDE_DIRS) $(DEFINES) @@ -16,7 +16,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2004/06/22 03:07:17 brad Exp $ # Other miscellaneous programs AR = @AR@ -@@ -37,23 +39,29 @@ DITHER_SRC = fs2.c fs2fast.c fs4.c hy +@@ -37,6 +39,7 @@ DITHER_SRC = fs2.c fs2fast.c fs4.c hy mono.c ordered.c ordered2.c mb_ordered.c LIBSRC = @libsrc@ LIBOBJ = @libobj@ @@ -24,10 +24,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2004/06/22 03:07:17 brad Exp $ # Other files of interest - - LIBRARY = libmpeg.a --SHLIB = libmpeg.so -+SHLIB = libmpeg.so.13.1 +@@ -46,15 +49,20 @@ SHLIB = libmpeg.so HEADER = mpeg.h EXTRAS = @extras@ @@ -42,13 +39,14 @@ $OpenBSD: patch-Makefile_in,v 1.1 2004/06/22 03:07:17 brad Exp $ +.c.so: + $(CC) -c $(CFLAGS) $(CPPFLAGS) $(PICFLAG) $< -o $@ --# Library/cleanup targets: ++ + # Library/cleanup targets: -all: lib $(EXTRAS) -+# Library/cleanup targets: - +- lib: $(LIBRARY) + shlib: $(SHLIB) @@ -63,17 +71,24 @@ $(LIBRARY): $(LIBOBJ) $(AR) $(ARFLAGS) $(LIBRARY) $(LIBOBJ) $(RANLIB) $(LIBRARY) diff --git a/graphics/mpeg-lib/pkg/PFRAG.shared b/graphics/mpeg-lib/pkg/PFRAG.shared index 7e8ec2fb899..ce8f037b42b 100644 --- a/graphics/mpeg-lib/pkg/PFRAG.shared +++ b/graphics/mpeg-lib/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2004/09/15 00:50:09 espie Exp $ -@lib lib/libmpeg.so.13.1 +@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/26 18:02:45 steven Exp $ +@lib lib/libmpeg.so.${LIBmpeg_VERSION}