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

Make this port build with USE_SYSTRACE=Yes. I forgot parts of a patch

Browse Source 
to scheduler/Makefile, sorry, guys!
This commit is contained in:
mbalmer 2006-10-01 16:02:24 +00:00
parent 303973f621
commit 9e49dd30d1
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
print/cups/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.13 2006/10/01 10:43:38 mbalmer Exp $
# $OpenBSD: Makefile,v 1.14 2006/10/01 16:02:24 mbalmer Exp $
COMMENT= "Common Unix Printing System"
VERSION= 1.2.4
DISTNAME= cups-${VERSION}-source
PKGNAME= ${DISTNAME:S/-source//}
PKGNAME= ${DISTNAME:S/-source//}p0
CATEGORIES= print sysutils
SHARED_LIBS= cups 2.3 \
cupsimage 2.3
@ -84,6 +84,9 @@ LIB_DEPENDS+= gnutls.>=12::security/gnutls
WANTLIB+= gpg-error.>=1 gcrypt.>=12
.endif
a:
echo $(DESTDIR)
post-configure:
cd ${WRKBUILD} && perl -pi -e 's|\$${DESTDIR}||g' init/cups.sh \
config.h cups-config conf/cupsd.conf man/*.man
@ -92,7 +95,8 @@ post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cups/init
@cd ${WRKINST}${SYSCONFDIR}/cups && cp -Rp * \
${PREFIX}/share/examples/cups
@rm -r ${WRKINST}${SYSCONFDIR}/cups
@rm -r ${WRKINST}${SYSCONFDIR}/cups ${WRKINST}/var/run \
${WRKINST}/var/cache
@${INSTALL_DATA} ${WRKBUILD}/init/cups.sh ${PREFIX}/share/cups/init
.for file in cups-enable cups-disable
@sed s,y0y0y0,${LOCALBASE}, < ${FILESDIR}/${file} > \

36
print/cups/patches/patch-scheduler_Makefile
View File

@ -1,10 +1,15 @@
$OpenBSD: patch-scheduler_Makefile,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
--- scheduler/Makefile.orig Wed Aug 23 21:39:39 2006
+++ scheduler/Makefile Tue Sep 26 20:33:59 2006
@@ -137,14 +137,14 @@ install: all
echo Creating $(STATEDIR)/certs...
$(INSTALL_DIR) -m 511 $(STATEDIR)/certs
-chgrp $(CUPS_PRIMARY_SYSTEM_GROUP) $(STATEDIR)/certs
$OpenBSD: patch-scheduler_Makefile,v 1.3 2006/10/01 16:02:24 mbalmer Exp $
--- scheduler/Makefile.orig Mon Sep 11 20:30:09 2006
+++ scheduler/Makefile Sun Oct 1 17:53:39 2006
@@ -134,22 +134,22 @@ install: all
echo Creating $(SERVERROOT)/ssl...
$(INSTALL_DIR) -m 700 $(SERVERROOT)/ssl
-chgrp $(CUPS_GROUP) $(SERVERROOT)/ssl
- echo Creating $(STATEDIR)...
- $(INSTALL_DIR) -m 755 $(STATEDIR)
- echo Creating $(STATEDIR)/certs...
- $(INSTALL_DIR) -m 511 $(STATEDIR)/certs
- -chgrp $(CUPS_PRIMARY_SYSTEM_GROUP) $(STATEDIR)/certs
- echo Creating $(LOGDIR)...
- $(INSTALL_DIR) -m 755 $(LOGDIR)
- echo Creating $(REQUESTS)...
@ -13,6 +18,14 @@ $OpenBSD: patch-scheduler_Makefile,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
- echo Creating $(REQUESTS)/tmp...
- $(INSTALL_DIR) -m 1770 $(REQUESTS)/tmp
- -chgrp $(CUPS_GROUP) $(REQUESTS)/tmp
- echo Creating $(CACHEDIR)...
- $(INSTALL_DIR) -m 775 $(CACHEDIR)
- -chgrp $(CUPS_GROUP) $(CACHEDIR)
+ echo Creating $(DESTDIR)$(STATEDIR)...
+ $(INSTALL_DIR) -m 755 $(DESTDIR)$(STATEDIR)
+ echo Creating $(DESTDIR)$(STATEDIR)/certs...
+ $(INSTALL_DIR) -m 511 $(DESTDIR)$(STATEDIR)/certs
+ -chgrp $(CUPS_PRIMARY_SYSTEM_GROUP) $(DESTDIR)$(STATEDIR)/certs
+# echo Creating $(LOGDIR)...
+# $(INSTALL_DIR) -m 755 $(LOGDIR)
+# echo Creating $(REQUESTS)...
@ -21,6 +34,9 @@ $OpenBSD: patch-scheduler_Makefile,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
+# echo Creating $(REQUESTS)/tmp...
+# $(INSTALL_DIR) -m 1770 $(REQUESTS)/tmp
+# -chgrp $(CUPS_GROUP) $(REQUESTS)/tmp
echo Creating $(CACHEDIR)...
$(INSTALL_DIR) -m 775 $(CACHEDIR)
-chgrp $(CUPS_GROUP) $(CACHEDIR)
+ echo Creating $(DESTDIR)$(CACHEDIR)...
+ $(INSTALL_DIR) -m 775 $(DESTDIR)$(CACHEDIR)
+ -chgrp $(CUPS_GROUP) $(DESTDIR)$(CACHEDIR)
# echo Creating $(CACHEDIR)/ppd...
# $(INSTALL_DIR) -m 755 $(CACHEDIR)/ppd
# -chgrp $(CUPS_GROUP) $(CACHEDIR)/ppd