FreeBSD Bugzilla – Attachment 100586 Details for
Bug 139888
[PATCH] print/cupsddk: allow to build without X11/FLTK
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
cupsddk-1.2.3_4.patch
cupsddk-1.2.3_4.patch (text/plain), 3.18 KB, created by
mwisnicki+freebsd
on 2009-10-24 16:40:04 UTC
(
hide
)
Description:
cupsddk-1.2.3_4.patch
Filename:
MIME Type:
Creator:
mwisnicki+freebsd
Created:
2009-10-24 16:40:04 UTC
Size:
3.18 KB
patch
obsolete
>diff -ruN --exclude=CVS /usr/ports/print/cupsddk.orig/Makefile /usr/ports/print/cupsddk/Makefile >--- /usr/ports/print/cupsddk.orig/Makefile 2009-08-03 00:13:40.000000000 +0200 >+++ /usr/ports/print/cupsddk/Makefile 2009-10-23 18:16:33.000000000 +0200 >@@ -7,7 +7,7 @@ > > PORTNAME= cupsddk > PORTVERSION= 1.2.3 >-PORTREVISION= 3 >+PORTREVISION= 4 > CATEGORIES= print devel > MASTER_SITES= EASYSW > MASTER_SITE_SUBDIR= ${PORTNAME}/${DISTVERSION} >@@ -16,21 +16,30 @@ > MAINTAINER= ahze@FreeBSD.org > COMMENT= CUPS Driver Development Kit > >-LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \ >- cupsimage.2:${PORTSDIR}/print/cups-image >+LIB_DEPENDS= cupsimage.2:${PORTSDIR}/print/cups-image > > WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} > GNU_CONFIGURE= yes >+USE_AUTOTOOLS= autoconf:262 > USE_GMAKE= yes > >+OPTIONS= X11 "built with FLTK gui" on >+ > MAN1= commandtoescpx.1 commandtopclx.1 cupsprofile.1 ppdc.1 ppdhtml.1 \ > ppdi.1 ppdmerge.1 ppdpo.1 rastertoescpx.1 rastertopclx.1 > MAN5= ppdcfile.5 > >+.include <bsd.port.pre.mk> >+ > .if defined(WITH_DEBUG) > CONFIGURE_ARGS+= --enable-debug > .endif > >+.if defined(WITH_X11) >+LIB_DEPENDS+= fltk.1:${PORTSDIR}/x11-toolkits/fltk >+CONFIGURE_ARGS+= --with-fltk >+.endif >+ > post-patch: > @${REINPLACE_CMD} -e 's|/cupsprofile.ppm|${DATADIR:S,${PREFIX}/share,,}/cupsprofile.ppm|' \ > ${WRKSRC}/cups/cupsprofile.c >@@ -40,4 +49,4 @@ > post-install: > @${INSTALL_DATA} ${WRKSRC}/cups/cupsprofile.ppm ${DATADIR} > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >diff -ruN --exclude=CVS /usr/ports/print/cupsddk.orig/files/patch-configure.in /usr/ports/print/cupsddk/files/patch-configure.in >--- /usr/ports/print/cupsddk.orig/files/patch-configure.in 1970-01-01 01:00:00.000000000 +0100 >+++ /usr/ports/print/cupsddk/files/patch-configure.in 2009-10-23 17:52:42.000000000 +0200 >@@ -0,0 +1,27 @@ >+diff -urN configure.in configure.in >+--- configure.in 2007-10-05 22:42:17.000000000 +0200 >++++ configure.in 2007-10-14 20:19:40.000000000 +0200 >+@@ -155,14 +155,16 @@ >+ AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR(CUPS headers are not installed!)) >+ >+ dnl Check for FLTK... >+-AC_PATH_PROG(FLTKCONFIG,fltk-config) >++AC_ARG_WITH([fltk], AS_HELP_STRING([--with-fltk], [Build with fltk library GUI (default: disabled)])) >+ >+-if test "x$FLTKCONFIG" = x; then >+-# AC_MSG_ERROR([Sorry, the CUPS DDK requires FLTK 1.1.x.]) >+- GUILIBS="" >+-else >+- CXXFLAGS="`$FLTKCONFIG --cflags` $CXXFLAGS" >+- GUILIBS="`$FLTKCONFIG --use-images --ldstaticflags`" >++if test "x$with_fltk" == "xyes"; then >++ AC_PATH_PROG(FLTKCONFIG,fltk-config) >++ if test "x$FLTKCONFIG" = x; then >++ AC_MSG_ERROR([Sorry, the CUPS DDK GUI requires FLTK 1.1.x.]) >++ else >++ CXXFLAGS="`$FLTKCONFIG --cflags` $CXXFLAGS" >++ GUILIBS="`$FLTKCONFIG --use-images --ldstaticflags`" >++ fi >+ fi >+ >+ AC_SUBST(FLTKCONFIG) >diff -ruN --exclude=CVS /usr/ports/print/cupsddk.orig/pkg-plist /usr/ports/print/cupsddk/pkg-plist >--- /usr/ports/print/cupsddk.orig/pkg-plist 2009-06-09 16:25:44.000000000 +0200 >+++ /usr/ports/print/cupsddk/pkg-plist 2009-10-23 18:12:49.000000000 +0200 >@@ -57,6 +57,7 @@ > @dirrmtry share/cups/drv > @dirrmtry share/cups > @dirrmtry share/doc/cups/help >+@dirrmtry share/doc/cups/examples > @dirrmtry share/doc/cups > @dirrmtry libexec/cups/driver > @dirrmtry libexec/cups
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 139888
: 100586