cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make SHARED_LIBS actually work, this was lying around for quite some time,

Browse Source 
no idea why I did not get committed...

prodded by bernd.
This commit is contained in:
mbalmer 2006-02-05 10:20:57 +00:00
parent 754eb0eb84
commit 771ece5153
6 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
print/cups/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.9 2005/12/23 20:17:41 mbalmer Exp $
# $OpenBSD: Makefile,v 1.10 2006/02/05 10:20:57 mbalmer Exp $
COMMENT= "Common Unix Printing System"
VERSION= 1.1.23
DISTNAME= cups-${VERSION}-source
PKGNAME= ${DISTNAME:S/-source//}p6
PKGNAME= ${DISTNAME:S/-source//}p7
CATEGORIES= print sysutils
SHARED_LIBS= cups 2.2 \
cupsimage 2.2
@ -37,6 +37,9 @@ LIB_DEPENDS= png.3::graphics/png \
FAKE_FLAGS= BINMODE=${BINMODE} \
SHAREMODE=${SHAREMODE}
MAKE_ENV+= LIBcups_VERSION=${LIBcups_VERSION} \
LIBcupsimage_VERSION=${LIBcupsimage_VERSION}
CONFIGURE_STYLE= gnu dest
AUTOCONF_VERSION= 2.59
CONFIGURE_ARGS+= --with-cups-user=_cups \
@ -52,7 +55,9 @@ CONFIGURE_ARGS+= --with-cups-user=_cups \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/libpng" \
DSOFLAGS="-L${LOCALBASE}/lib" \
LDFLAGS="-L${LOCALBASE}/lib"
LDFLAGS="-L${LOCALBASE}/lib" \
LIBcups_VERSION=${LIBcups_VERSION} \
LIBcupsimage_VERSION=${LIBcupsimage_VERSION}
CFLAGS+= "-I${LOCALBASE}/include" \
"-I${LOCALBASE}/include/libpng"

4
print/cups/patches/patch-config-scripts_cups-sharedlibs_m4
View File

@ -6,8 +6,8 @@
OSF1* | Linux | GNU | *BSD*)
- LIBCUPS="libcups.so.2"
- LIBCUPSIMAGE="libcupsimage.so.2"
+ LIBCUPS="libcups.so.2.2"
+ LIBCUPSIMAGE="libcupsimage.so.2.2"
+ LIBCUPS="libcups.so.${LIBcups_VERSION}"
+ LIBCUPSIMAGE="libcupsimage.so.${LIBcupsimage_VERSION}"
DSO="\$(CC)"
DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
;;

6
print/cups/patches/patch-configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.1.1.1 2005/01/16 12:36:50 mbalmer Exp $
$OpenBSD: patch-configure,v 1.2 2006/02/05 10:20:57 mbalmer Exp $
--- configure.orig Sun Nov 7 15:35:16 2004
+++ configure Sun Nov 7 15:35:34 2004
@@ -7082,8 +7082,8 @@ if test x$enable_shared != xno; then
@ -7,8 +7,8 @@ $OpenBSD: patch-configure,v 1.1.1.1 2005/01/16 12:36:50 mbalmer Exp $
OSF1* | Linux | GNU | *BSD*)
- LIBCUPS="libcups.so.2"
- LIBCUPSIMAGE="libcupsimage.so.2"
+ LIBCUPS="libcups.so.2.2"
+ LIBCUPSIMAGE="libcupsimage.so.2.2"
+ LIBCUPS="libcups.so.${LIBcups_VERSION}"
+ LIBCUPSIMAGE="libcupsimage.so.${LIBcupsimage_VERSION}"
DSO="\$(CC)"
DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
;;

16
print/cups/patches/patch-cups_Makefile
View File

@ -5,7 +5,7 @@
clean:
- $(RM) $(OBJS) $(TARGETS) `basename $(LIBCUPS) .2` libcups.dylib
+ $(RM) $(OBJS) $(TARGETS) `basename $(LIBCUPS) .2.2` libcups.dylib
+ $(RM) $(OBJS) $(TARGETS) `basename $(LIBCUPS) .${LIBcups_VERSION}` libcups.dylib
#
@ -16,9 +16,9 @@
- if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
- $(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
- $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
+ if test $(LIBCUPS) = "libcups.so.2.2" -o $(LIBCUPS) = "libcups.sl.2.2"; then \
+ $(RM) $(LIBDIR)/`basename $(LIBCUPS) .2.2`; \
+ $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2.2`; \
+ if test $(LIBCUPS) = "libcups.so.${LIBcups_VERSION}" -o $(LIBCUPS) = "libcups.sl.${LIBcups_VERSION}"; then \
+ $(RM) $(LIBDIR)/`basename $(LIBCUPS) .${LIBcups_VERSION}`; \
+ $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .${LIBcups_VERSION}`; \
fi
if test $(LIBCUPS) = "libcups.2.dylib"; then \
$(STRIP) -x $(LIBDIR)/$(LIBCUPS); \
@ -27,17 +27,17 @@
#
-# libcups.so.2, libcups.sl.2
+# libcups.so.2.2, libcups.sl.2
+# libcups.so.${LIBcups_VERSION}, libcups.sl.2
#
-libcups.so.2 libcups.sl.2: $(LIBOBJS) ../Makedefs
+libcups.so.2.2 libcups.sl.2: $(LIBOBJS) ../Makedefs
+libcups.so.${LIBcups_VERSION} libcups.sl.2: $(LIBOBJS) ../Makedefs
echo Linking $@...
$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS)
- $(RM) `basename $@ .2`
- $(LN) $@ `basename $@ .2`
+ $(RM) `basename $@ .2.2`
+ $(LN) $@ `basename $@ .2.2`
+ $(RM) `basename $@ .${LIBcups_VERSION}`
+ $(LN) $@ `basename $@ .${LIBcups_VERSION}`
#

2
print/cups/patches/patch-doc_sam_html
View File

@ -6,7 +6,7 @@
</TR>
-<TR VALIGN="TOP"><TD>/usr/lib/libcups.so.2
-<BR> /usr/lib/libcupsimage.so.2</TD><TD>Shared libraries (all others)</TD>
+<TR VALIGN="TOP"><TD>/usr/lib/libcups.so.2.2
+<TR VALIGN="TOP"><TD>/usr/lib/libcups.so.${LIBcups_VERSION}
+<BR> /usr/lib/libcupsimage.so.2.2</TD><TD>Shared libraries (all others)</TD>
</TR>
<TR VALIGN="TOP"><TD>/usr/libexec/cups/backend/</TD><TD>Backends for

14
print/cups/patches/patch-filter_Makefile
View File

@ -5,7 +5,7 @@
clean:
$(RM) $(OBJS) $(TARGETS) $(LIBCUPSIMAGE) libcupsimage.a
- $(RM) `basename $(LIBCUPSIMAGE) .2` libcupsimage.dylib
+ $(RM) `basename $(LIBCUPSIMAGE) .2.2` libcupsimage.dylib
+ $(RM) `basename $(LIBCUPSIMAGE) .${LIBcupsimage_VERSION}` libcupsimage.dylib
#
@ -16,9 +16,9 @@
- -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
- $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
- $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
+ -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
+ $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2.2`; \
+ $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2.2`; \
+ -if test $(LIBCUPSIMAGE) = "libcupsimage.so.${LIBcupsimage_VERSION}" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
+ $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .${LIBcupsimage_VERSION}`; \
+ $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .${LIBcupsimage_VERSION}`; \
fi
-if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
$(STRIP) -x $(LIBDIR)/$(LIBCUPSIMAGE); \
@ -27,13 +27,13 @@
#
-libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS) ../Makedefs
+libcupsimage.so.2.2 libcupsimage.sl.2: $(IMAGEOBJS) ../Makedefs
+libcupsimage.so.${LIBcupsimage_VERSION} libcupsimage.sl.2: $(IMAGEOBJS) ../Makedefs
echo Linking $@...
$(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm
- $(RM) `basename $@ .2`
- $(LN) $@ `basename $@ .2`
+ $(RM) `basename $@ .2.2`
+ $(LN) $@ `basename $@ .2.2`
+ $(RM) `basename $@ .${LIBcupsimage_VERSION}`
+ $(LN) $@ `basename $@ .${LIBcupsimage_VERSION}`
#