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

Fix build on a clean machine by not checking for a file converter.

Browse Source 
breakage reported by jasper@

While here:
* remove the ppr stuffs
* remove bundled strlcpy / strlcat
This commit is contained in:
ajacoutot 2010-04-27 14:01:43 +00:00
parent 46b18002b5
commit 10ba7c1182
4 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
print/foomatic-filters/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.15 2010/04/18 09:04:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.16 2010/04/27 14:01:43 ajacoutot Exp $
COMMENT= Foomatic PPD print filters
DISTNAME= foomatic-filters-4.0.4
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= print
HOMEPAGE= http://www.linuxfoundation.org/en/OpenPrinting/Database/Foomatic
@ -28,6 +28,8 @@ RUN_DEPENDS= ::print/ghostscript/gnu \
AUTOCONF_VERSION=2.61
INSTALL_TARGET= install-main install-cups
CONFIGURE_STYLE= autoconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
@ -43,6 +45,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
ENSCRIPT="${LOCALBASE}/bin/enscript" \
MPAGE="${LOCALBASE}/bin/mpage"
CONFIGURE_ARGS= --enable-file-converter-check=no
MAKE_ENV= ${CONFIGURE_ENV}
FAKE_FLAGS= ETCDIR="${PREFIX}/share/examples/foomatic"
pre-configure:

19
print/foomatic-filters/patches/patch-util_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-util_c,v 1.1 2010/04/27 14:01:43 ajacoutot Exp $
--- util.c.orig Mon Apr 19 10:28:13 2010
+++ util.c Mon Apr 19 10:28:55 2010
@@ -138,6 +138,7 @@ int omit_shellescapes(int c) { return strchr(shellesca
int omit_specialchars(int c) { return omit_unprintables(c) || omit_shellescapes(c); }
int omit_whitespace(int c) { return c == ' ' || c == '\t'; }
+#ifndef __OpenBSD__
size_t strlcpy(char *dest, const char *src, size_t size)
{
char *pdest = dest;
@@ -177,6 +178,7 @@ size_t strlcat(char *dest, const char *src, size_t siz
return len + (psrc - src);
}
+#endif /* ! __OpenBSD__ */
void strrepl(char *str, const char *chars, char repl)
{

14
print/foomatic-filters/patches/patch-util_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-util_h,v 1.1 2010/04/27 14:01:43 ajacoutot Exp $
--- util.h.orig Mon Apr 19 10:29:24 2010
+++ util.h Mon Apr 19 10:29:52 2010
@@ -63,8 +63,10 @@ int omit_whitespace(int c);
/* Copy at most size-1 characters from src to dest
dest will always be \0 terminated (unless size == 0)
returns strlen(src) */
+#ifndef __OpenBSD__
size_t strlcpy(char *dest, const char *src, size_t size);
size_t strlcat(char *dest, const char *src, size_t size);
+#endif
/* Replace all occurences of each of the characters in 'chars' by 'repl' */
void strrepl(char *str, const char *chars, char repl);

7
print/foomatic-filters/pkg/PLIST
View File

@ -1,12 +1,7 @@
@comment $OpenBSD: PLIST,v 1.5 2010/03/21 14:39:40 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.6 2010/04/27 14:01:43 ajacoutot Exp $
@conflict hpijs-<1.5p1
@conflict cups-<=1.2.7p13
@bin bin/foomatic-rip
@comment lib/ppr/
@comment lib/ppr/interfaces/
@comment lib/ppr/interfaces/foomatic-rip
@comment lib/ppr/lib/
@comment lib/ppr/lib/foomatic-rip
libexec/cups/backend/
libexec/cups/backend/beh
libexec/cups/filter/foomatic-rip