openbsd-ports/print/cups/patches/patch-scheduler_Makefile
ajacoutot eebf14a545 Update to cups-1.4.4.
Fixes several security, scheduler, printing, and conformance issues.
2010-06-27 04:18:50 +00:00

63 lines
2.1 KiB
Plaintext

$OpenBSD: patch-scheduler_Makefile,v 1.6 2010/06/27 04:18:50 ajacoutot Exp $
--- scheduler/Makefile.orig Fri Apr 23 20:56:34 2010
+++ scheduler/Makefile Sun Jun 27 06:09:51 2010
@@ -150,21 +150,6 @@ install-data:
echo Creating $(SERVERROOT)/ssl...; \
$(INSTALL_DIR) -m 700 -g $(CUPS_GROUP) $(SERVERROOT)/ssl; \
fi
- if test "$(STATEDIR)" != "$(SERVERROOT)"; then \
- echo Creating $(STATEDIR)...; \
- $(INSTALL_DIR) -m 755 $(STATEDIR); \
- fi
- echo Creating $(STATEDIR)/certs...
- $(INSTALL_DIR) -m 511 -o $(CUPS_USER) -g $(CUPS_PRIMARY_SYSTEM_GROUP) \
- $(STATEDIR)/certs
- echo Creating $(LOGDIR)...
- $(INSTALL_DIR) -m 755 $(LOGDIR)
- echo Creating $(REQUESTS)...
- $(INSTALL_DIR) -m 710 -g $(CUPS_GROUP) $(REQUESTS)
- echo Creating $(REQUESTS)/tmp...
- $(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp
- echo Creating $(CACHEDIR)...
- $(INSTALL_DIR) -m 775 -g $(CUPS_GROUP) $(CACHEDIR)
#
@@ -213,10 +198,6 @@ install-libs: $(INSTALLSTATIC)
echo Installing libraries in $(LIBDIR)...
$(INSTALL_DIR) -m 755 $(LIBDIR)
$(INSTALL_LIB) $(LIBCUPSMIME) $(LIBDIR)
- if test $(LIBCUPSMIME) = "libcupsmime.so.1" -o $(LIBCUPSMIME) = "libcupsmime.sl.1"; then \
- $(RM) $(LIBDIR)/`basename $(LIBCUPSMIME) .1`; \
- $(LN) $(LIBCUPSMIME) $(LIBDIR)/`basename $(LIBCUPSMIME) .1`; \
- fi
if test $(LIBCUPSMIME) = "libcupsmime.1.dylib"; then \
$(RM) $(LIBDIR)/libcupsmime.dylib; \
$(LN) $(LIBCUPSMIME) $(LIBDIR)/libcupsmime.dylib; \
@@ -265,7 +246,7 @@ uninstall:
$(RM) $(LIBDIR)/libcupsmime.sl
$(RM) $(LIBDIR)/libcupsmime.sl.1
$(RM) $(LIBDIR)/libcupsmime.so
- $(RM) $(LIBDIR)/libcupsmime.so.1
+ $(RM) $(LIBDIR)/libcupsmime.so.${LIBcupsmime_VERSION}
-$(RMDIR) $(LIBDIR)
$(RM) $(INCLUDEDIR)/cups/mime.h
-$(RMDIR) $(INCLUDEDIR)/cups
@@ -362,14 +343,12 @@ cups-polld: cups-polld.o ../cups/$(LIBCUPS)
#
-# libcupsmime.so.1, libcupsmime.sl.1
+# libcupsmime.so.${LIBcupsmime_VERSION}, libcupsmime.sl.1
#
-libcupsmime.so.1 libcupsmime.sl.1: $(LIBOBJS)
+libcupsmime.so.${LIBcupsmime_VERSION} libcupsmime.sl.1: $(LIBOBJS)
echo Linking $@...
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
- $(RM) `basename $@ .1`
- $(LN) $@ `basename $@ .1`
#