Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Mar 2013 01:39:27 +0100 (CET)
From:      Pierre Guinoiseau <pierre@guinoiseau.eu>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        gnome@FreeBSD.org
Subject:   [PATCH] print/freetype2: convert to optionsNG, use USE_PKGCONFIG
Message-ID:  <20130310003927.687E2CF@alderaan.home.poildetroll.net>

next in thread | raw e-mail | index | archive | help

>Submitter-Id:	current-users
>Originator:	Pierre Guinoiseau <pierre@guinoiseau.eu>
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] print/freetype2: convert to optionsNG, use USE_PKGCONFIG
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 9.1-STABLE amd64
>Environment:
System: FreeBSD alderaan.home.poildetroll.net 9.1-STABLE FreeBSD 9.1-STABLE #0 r247032: Wed Feb 20 18:49:15 CET
>Description:
- Convert port to optionsNG
- Use USE_PKGCONFIG=build instead of USE_GNOME=pkgconfig

Port maintainer (gnome@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_7 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- freetype2-2.4.11.patch begins here ---
diff -ruN /usr/ports/print/freetype2/Makefile ./Makefile
--- /usr/ports/print/freetype2/Makefile	2012-12-29 06:07:59.000000000 +0100
+++ ./Makefile	2013-03-10 01:33:36.612541668 +0100
@@ -23,28 +23,35 @@
 MAKE_ENV=	TOP=""
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig ltverhack:9
+USE_GNOME=	ltverhack:9
+USE_PKGCONFIG=	build
 LIBTOOLFILES=	builds/unix/configure
 CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix
 
-.if defined(WITH_LCD_FILTERING)
+OPTIONS_DEFINE=	LCD_FILTERING
+LCD_FILTERING_DESC=	Enable LCD filtering (patented)
+#CJK_DESC=		Enable the Firefly font patchset
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MLCD_FILTERING}
 CFLAGS+=	-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
 .endif
 
-.if defined(WITH_CJK)
+#.if ${PORT_OPTIONS:MCJK}
 #PATCH_SITES+=	http://lwj-hinet.myweb.hinet.net/ \
 #		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \
 #		http://bsdchat.com/dist/firefly-cjk-patchset/
 #PATCHFILES+=	cjk-freetype-2.1.10-20051219.patch.gz
 #PATCH_DIST_STRIP+=	-p1
-.endif
+#.endif
 
 pre-everything::
-.if !defined(WITH_LCD_FILTERING)
+.if !${PORT_OPTIONS:MLCD_FILTERING}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You may want to enable LCD filtering."
 	@${ECHO_MSG}
-	@${ECHO_MSG} "Hit Ctrl-C now and use \"make WITH_LCD_FILTERING=yes\""
+	@${ECHO_MSG} "Hit Ctrl-C now and use \"make WITH=LCD_FILTERING\""
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Note that there are possible patent issues related to the"
 	@${ECHO_MSG} "use of the LCD filtering technology."
@@ -57,7 +64,7 @@
 
 pre-configure:
 	@${REINPLACE_CMD} -e '/^LIBTOOL/s|LIBTOOL := $$(FT_LIBTOOL_DIR)/libtool|LIBTOOL := ${WRKDIR}/gnome-libtool|' \
-	    	${WRKSRC}/builds/unix/unix-cc.in
+		${WRKSRC}/builds/unix/unix-cc.in
 
 post-configure:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
--- freetype2-2.4.11.patch ends here ---




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130310003927.687E2CF>