switch to SHARED_LIBS + some old conflict prevention

This commit is contained in:
espie 2005-12-23 15:07:05 +00:00
parent 33f715979d
commit 4f0340f3ad
4 changed files with 27 additions and 16 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.25 2005/04/17 21:18:29 espie Exp $
# $OpenBSD: Makefile,v 1.26 2005/12/23 15:07:05 espie Exp $
COMMENT= "network audio player"
DISTNAME= rplay-3.3.2
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= audio
SHARED_LIBS= rplay 0.0
HOMEPAGE= http://rplay.doit.org/
@ -25,6 +26,8 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${DEPBASE}/include" \
LDFLAGS="-L${DEPBASE}/lib"
MAKE_FLAGS= LIBrplay_VERSION=${LIBrplay_VERSION}
FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR=${WRKINST}
post-extract:
@cd ${WRKSRC}/doc && mv rplay.texi rplayd.texi

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-librplay_Makefile.in,v 1.3 2002/08/17 05:11:09 brad Exp $
--- librplay/Makefile.in.orig Mon Mar 22 21:38:38 1999
+++ librplay/Makefile.in Sat Aug 17 01:04:17 2002
$OpenBSD: patch-librplay_Makefile.in,v 1.4 2005/12/23 15:07:06 espie Exp $
--- librplay/Makefile.in.orig Tue Mar 23 03:38:38 1999
+++ librplay/Makefile.in Thu Dec 22 12:47:41 2005
@@ -9,7 +9,7 @@ INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS= @srcdir@/../mkinstalldirs
@ -10,35 +10,41 @@ $OpenBSD: patch-librplay_Makefile.in,v 1.3 2002/08/17 05:11:09 brad Exp $
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
@@ -23,7 +23,7 @@ SRCS= rplay.c rptp.c async.c
@@ -18,12 +18,13 @@ LDFLAGS= $(LD_OPTIONS) -shared @LDFLAGS@
.c.lo:
$(CC) -c -fPIC $(CPPFLAGS) $(CFLAGS) -o $@ $<
+LIBrplay_VERSION=0.0
TARGET= $(LIBRPLAY_NAME)
SRCS= rplay.c rptp.c async.c
OBJS= rplay.o rptp.o async.o
SHAREDOBJS= rplay.lo rptp.lo async.lo
-all: $(TARGET) librplay.so
+all: $(TARGET) librplay.so.0.0
+all: $(TARGET) librplay.so.${LIBrplay_VERSION}
#
# Use the following for SunOS 4.1.x, Solaris 2.x, Linux, NetBSD
@@ -32,7 +32,7 @@ $(TARGET): $(OBJS)
@@ -32,7 +33,7 @@ $(TARGET): $(OBJS)
$(AR) rcv $@ $?
$(RANLIB) $@
-librplay.so: $(SHAREDOBJS)
+librplay.so.0.0: $(SHAREDOBJS)
+librplay.so.${LIBrplay_VERSION}: $(SHAREDOBJS)
$(CC) -o $@ $(SHAREDOBJS) $(LDFLAGS)
#
@@ -50,11 +50,11 @@ librplay.so: $(SHAREDOBJS)
@@ -50,11 +51,11 @@ librplay.so: $(SHAREDOBJS)
install: all
$(MKINSTALLDIRS) $(libdir)
$(INSTALL_DATA) $(TARGET) $(libdir)
- $(INSTALL_DATA) librplay.so $(libdir)
+ $(INSTALL_DATA) librplay.so.0.0 $(libdir)
+ $(INSTALL_DATA) librplay.so.${LIBrplay_VERSION} $(libdir)
uninstall:
$(RM) $(libdir)/$(TARGET)
- $(RM) $(libdir)/librplay.so
+ $(RM) $(libdir)/librplay.so.0.0
+ $(RM) $(libdir)/librplay.so.${LIBrplay_VERSION}
clean:
$(RM) $(OBJS) $(SHAREDOBJS) $(TARGET) librplay.so a.out core *~ *.bak *.orig TAGS

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/08/06 14:37:28 espie Exp $
@lib lib/librplay.so.0.0
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/23 15:07:06 espie Exp $
@lib lib/librplay.so.${LIBrplay_VERSION}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2005/04/17 21:18:29 espie Exp $
@comment $OpenBSD: PLIST,v 1.15 2005/12/23 15:07:06 espie Exp $
%%SHARED%%
include/rplay.h
@comment include/rxposix.h
@ -7,10 +7,12 @@ lib/librplay.a
@endfake
bin/rplay
bin/rptp
@comment include/rxposix.h
@info info/RPLAY.info
@info info/RPTP.info
@info info/librplay.info
@info info/rplayd.info
@comment lib/librx.a
@man man/man1/rplay.1
@man man/man1/rptp.1
@man man/man5/rplay.conf.5
@ -19,9 +21,9 @@ bin/rptp
@man man/man5/rplay.servers.5
@man man/man8/rplayd.8
sbin/rplayd
@mode 755
@owner root
@group wheel
@mode 755
share/examples/rplay/
@sample ${SYSCONFDIR}/rplay/
@mode 644