diff options
| author | Scott Mace <smace@FreeBSD.org> | 1998-09-19 19:06:50 +0000 |
|---|---|---|
| committer | Scott Mace <smace@FreeBSD.org> | 1998-09-19 19:06:50 +0000 |
| commit | ffc7cea58e18e499521be9031d5972b61fd1e9dc (patch) | |
| tree | 074a2ea2052337c83c088321c381c2ee000ed45a /graphics/mpeg-lib | |
| parent | Convert to ELF (diff) | |
Convert to ELF
Notes
Notes:
svn path=/head/; revision=13252
Diffstat (limited to 'graphics/mpeg-lib')
| -rw-r--r-- | graphics/mpeg-lib/Makefile | 4 | ||||
| -rw-r--r-- | graphics/mpeg-lib/files/patch-aa | 16 | ||||
| -rw-r--r-- | graphics/mpeg-lib/pkg-plist | 5 |
3 files changed, 18 insertions, 7 deletions
diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile index 78d01e5ee014..903b1ea31918 100644 --- a/graphics/mpeg-lib/Makefile +++ b/graphics/mpeg-lib/Makefile @@ -3,7 +3,7 @@ # Date created: 16 November 1994 # Whom: torstenb # -# $Id: Makefile,v 1.7 1997/10/15 13:17:39 erich Exp $ +# $Id: Makefile,v 1.8 1998/03/15 19:43:13 steve Exp $ # DISTNAME= mpeg_lib-1.2.1 @@ -20,6 +20,6 @@ pre-install: @mkdir -p ${PREFIX}/bin ${PREFIX}/lib ${PREFIX}/include post-install: - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/graphics/mpeg-lib/files/patch-aa b/graphics/mpeg-lib/files/patch-aa index 357f5691a0f7..4e46f6c3dbd4 100644 --- a/graphics/mpeg-lib/files/patch-aa +++ b/graphics/mpeg-lib/files/patch-aa @@ -1,5 +1,5 @@ --- Makefile.in.orig Mon Feb 26 12:12:54 1996 -+++ Makefile.in Tue Oct 14 14:38:05 1997 ++++ Makefile.in Sat Sep 19 13:23:32 1998 @@ -16,6 +16,7 @@ RANLIB = @RANLIB@ SHELL = /bin/sh @@ -8,7 +8,7 @@ # Source for the library itself -- note that we define LIBSRC and # LIBOBJ this way (instead of just LIBOBJ=$(LIBSRC:.c=.o) because -@@ -27,23 +28,32 @@ +@@ -27,23 +28,42 @@ mono.c ordered.c ordered2.c mb_ordered.c LIBSRC = @libsrc@ LIBOBJ = @libobj@ @@ -18,7 +18,11 @@ # Other files of interest LIBRARY = libmpeg.a ++.if ${PORTOBJFORMAT} == elf ++SHLIBRARY = libmpeg.so.1 ++.else +SHLIBRARY = libmpeg.so.1.2 ++.endif MPEGTEST = mpegtest # Targets for all platforms @@ -31,18 +35,24 @@ $(RANLIB) $(LIBRARY) +$(SHLIBRARY): $(SHLIBOBJ) ++.if ${PORTOBJFORMAT} == elf ++ cc -shared -Wl,-soname,$(SHLIBRARY) -o $(SHLIBRARY) $(SHLIBOBJ) ++.else + cc -shared -o $(SHLIBRARY) $(SHLIBOBJ) ++.endif ++ ln -sf $(SHLIBRARY) `echo $(SHLIBRARY) | sed 's/\.so.*$$/.so/'` + $(LIBOBJ): Makefile +install: + install -c -m 444 ${LIBRARY} ${SHLIBRARY} ${PREFIX}/lib ++ (cd ${PREFIX}/lib;ln -sf $(SHLIBRARY) `echo $(SHLIBRARY) | sed 's/\.so.*$$/.so/'`) + install -c -m 444 mpeg.h ${PREFIX}/include + @Makefile_extras@ clean: -@@ -53,6 +63,9 @@ +@@ -53,6 +73,9 @@ distclean: clean rm -f config.cache config.log config.status Makefile config.h cd extras && $(MAKE) distclean diff --git a/graphics/mpeg-lib/pkg-plist b/graphics/mpeg-lib/pkg-plist index de0b6fdb4ba7..c74d5e5b370b 100644 --- a/graphics/mpeg-lib/pkg-plist +++ b/graphics/mpeg-lib/pkg-plist @@ -1,5 +1,6 @@ lib/libmpeg.a lib/libmpeg.so.1.2 -@exec /sbin/ldconfig -m %B -@unexec /sbin/ldconfig -R +lib/libmpeg.so +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R include/mpeg.h |