Attachment #100586 for bug #139888

View | Details | Raw Unified | Return to bug 139888
Collapse All | Expand All

Lines 7-13 Link Here

(-)/usr/ports/print/cupsddk/Makefile (-4 / +13 lines)
7		7
8	PORTNAME= cupsddk	8	PORTNAME= cupsddk
9	PORTVERSION= 1.2.3	9	PORTVERSION= 1.2.3
10	PORTREVISION= 3	10	PORTREVISION= 4
11	CATEGORIES= print devel	11	CATEGORIES= print devel
12	MASTER_SITES= EASYSW	12	MASTER_SITES= EASYSW
13	MASTER_SITE_SUBDIR= ${PORTNAME}/${DISTVERSION}	13	MASTER_SITE_SUBDIR= ${PORTNAME}/${DISTVERSION}
Lines 16-36 Link Here
16	MAINTAINER= ahze@FreeBSD.org	16	MAINTAINER= ahze@FreeBSD.org
17	COMMENT= CUPS Driver Development Kit	17	COMMENT= CUPS Driver Development Kit
18		18
19	LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \	19	LIB_DEPENDS= cupsimage.2:${PORTSDIR}/print/cups-image
20	cupsimage.2:${PORTSDIR}/print/cups-image
21		20
22	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}	21	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
23	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
		23	USE_AUTOTOOLS= autoconf:262
24	USE_GMAKE= yes	24	USE_GMAKE= yes
25		25
		26	OPTIONS= X11 "built with FLTK gui" on
		27
26	MAN1= commandtoescpx.1 commandtopclx.1 cupsprofile.1 ppdc.1 ppdhtml.1 \	28	MAN1= commandtoescpx.1 commandtopclx.1 cupsprofile.1 ppdc.1 ppdhtml.1 \
27	ppdi.1 ppdmerge.1 ppdpo.1 rastertoescpx.1 rastertopclx.1	29	ppdi.1 ppdmerge.1 ppdpo.1 rastertoescpx.1 rastertopclx.1
28	MAN5= ppdcfile.5	30	MAN5= ppdcfile.5
29		31
		32	.include <bsd.port.pre.mk>
		33
30	.if defined(WITH_DEBUG)	34	.if defined(WITH_DEBUG)
31	CONFIGURE_ARGS+= --enable-debug	35	CONFIGURE_ARGS+= --enable-debug
32	.endif	36	.endif
33		37
		38	.if defined(WITH_X11)
		39	LIB_DEPENDS+= fltk.1:${PORTSDIR}/x11-toolkits/fltk
		40	CONFIGURE_ARGS+= --with-fltk
		41	.endif
		42
34	post-patch:	43	post-patch:
35	@${REINPLACE_CMD} -e 's\|/cupsprofile.ppm\|${DATADIR:S,${PREFIX}/share,,}/cupsprofile.ppm\|' \	44	@${REINPLACE_CMD} -e 's\|/cupsprofile.ppm\|${DATADIR:S,${PREFIX}/share,,}/cupsprofile.ppm\|' \
36	${WRKSRC}/cups/cupsprofile.c	45	${WRKSRC}/cups/cupsprofile.c
Lines 40-43 Link Here
40	post-install:	49	post-install:
41	@${INSTALL_DATA} ${WRKSRC}/cups/cupsprofile.ppm ${DATADIR}	50	@${INSTALL_DATA} ${WRKSRC}/cups/cupsprofile.ppm ${DATADIR}
42		51
43	.include <bsd.port.mk>	52	.include <bsd.port.post.mk>




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)

Lines 57-62 Link Here

(-)/usr/ports/print/cupsddk/pkg-plist (+1 lines)
57	@dirrmtry share/cups/drv	57	@dirrmtry share/cups/drv
58	@dirrmtry share/cups	58	@dirrmtry share/cups
59	@dirrmtry share/doc/cups/help	59	@dirrmtry share/doc/cups/help
		60	@dirrmtry share/doc/cups/examples
60	@dirrmtry share/doc/cups	61	@dirrmtry share/doc/cups
61	@dirrmtry libexec/cups/driver	62	@dirrmtry libexec/cups/driver
62	@dirrmtry libexec/cups	63	@dirrmtry libexec/cups

Return to bug 139888

Line 0 Link Here

(-)/usr/ports/print/cupsddk/files/patch-configure.in (+27 lines)
	1	diff -urN configure.in configure.in
	2	--- configure.in 2007-10-05 22:42:17.000000000 +0200
	3	+++ configure.in 2007-10-14 20:19:40.000000000 +0200
	4	@@ -155,14 +155,16 @@
	5	AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR(CUPS headers are not installed!))
	6
	7	dnl Check for FLTK...
	8	-AC_PATH_PROG(FLTKCONFIG,fltk-config)
	9	+AC_ARG_WITH([fltk], AS_HELP_STRING([--with-fltk], [Build with fltk library GUI (default: disabled)]))
	10
	11	-if test "x$FLTKCONFIG" = x; then
	12	-# AC_MSG_ERROR([Sorry, the CUPS DDK requires FLTK 1.1.x.])
	13	- GUILIBS=""
	14	-else
	15	- CXXFLAGS="`$FLTKCONFIG --cflags` $CXXFLAGS"
	16	- GUILIBS="`$FLTKCONFIG --use-images --ldstaticflags`"
	17	+if test "x$with_fltk" == "xyes"; then
	18	+ AC_PATH_PROG(FLTKCONFIG,fltk-config)
	19	+ if test "x$FLTKCONFIG" = x; then
	20	+ AC_MSG_ERROR([Sorry, the CUPS DDK GUI requires FLTK 1.1.x.])
	21	+ else
	22	+ CXXFLAGS="`$FLTKCONFIG --cflags` $CXXFLAGS"
	23	+ GUILIBS="`$FLTKCONFIG --use-images --ldstaticflags`"
	24	+ fi
	25	fi
	26
	27	AC_SUBST(FLTKCONFIG)