Date: Fri, 7 Jun 2013 12:26:46 GMT From: Otacílio de Araújo Ramos Neto <otacilio.neto@bsd.com.br> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/179400: Update to port freetype2 to add Infinality patches Message-ID: <201306071226.r57CQk2e078326@oldred.freebsd.org> Resent-Message-ID: <201306071230.r57CU0rg017662@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179400
>Category: ports
>Synopsis: Update to port freetype2 to add Infinality patches
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 07 12:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Otacílio de Araújo Ramos Neto
>Release: 8.3-RELEASE-p6
>Organization:
>Environment:
FreeBSD squitch 8.3-RELEASE-p6 FreeBSD 8.3-RELEASE-p6 #26: Wed Mar 20 16:02:44 BRT 2013 ota@squitch:/usr/obj/usr/src/sys/SQUITCH i386
>Description:
Added support to Infinality patches using a option.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/print/freetype2/Makefile ./Makefile
--- /usr/ports/print/freetype2/Makefile 2013-05-22 14:57:15.000000000 -0300
+++ ./Makefile 2013-06-06 12:02:55.000000000 -0300
@@ -4,7 +4,7 @@
PORTNAME= freetype2
PORTVERSION= 2.4.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= SF/freetype/${PORTNAME}/${PORTVERSION} \
http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \
@@ -13,6 +13,7 @@
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \
ftp://ftp.freetype.org/freetype/freetype2/
DISTNAME= ${PORTNAME:S/2//}-${PORTVERSION}
+DISTFILES= ${DISTNAME}.tar.bz2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A free and portable TrueType font rendering engine
@@ -28,9 +29,10 @@
LIBTOOLFILES= builds/unix/configure
CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix
-OPTIONS_DEFINE= LCD_FILTERING CFF_HINTING_ADOBE
+OPTIONS_DEFINE= LCD_FILTERING CFF_HINTING_ADOBE INFINALITY
LCD_FILTERING_DESC?= Sub-pixel rendering (patented)
CFF_HINTING_ADOBE_DESC= CFF parsing and hinting engine by Adobe and Google
+INFINALITY_DESC= Apply Infinality patch set to get a best rendering
.include <bsd.port.options.mk>
@@ -38,6 +40,14 @@
CFLAGS+= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
.endif
+.if ${PORT_OPTIONS:MINFINALITY}
+MASTER_SITES+=http://www.infinality.net/fedora/linux/zips/:infinality
+DISTFILES+=freetype-infinality-2.4.12-20130514_01-x86_64.tar.bz2:infinality
+PLIST_SUB+= INF=""
+.else
+PLIST_SUB+= INF="@comment "
+.endif
+
pre-patch:
@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
${WRKSRC}/builds/unix/install.mk
@@ -46,6 +56,35 @@
${WRKSRC}/src/cff/cffobjs.c
.endif
+post-patch:
+.if ${PORT_OPTIONS:MINFINALITY}
+ ${PATCH} -p1 -d ${WRKSRC}/ < ${WRKDIR}/freetype-entire-infinality-patchset-20130514-01.patch
+.endif
+
+post-install:
+.if ${PORT_OPTIONS:MINFINALITY}
+ @${MKDIR} ${ETCDIR}
+ @${INSTALL_DATA} ${WRKDIR}/infinality-settings.sh ${ETCDIR}/infinality-settings.sh
+
+ @${ECHO_MSG} "#"
+ @${ECHO_MSG} "# WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
+ @${ECHO_MSG} "# WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
+ @${ECHO_MSG} "#"
+ @${ECHO_MSG} "# The file ${ETCDIR}/infinality-settings.sh should be copied to "
+ @${ECHO_MSG} "# ${PREFIX}/etc/profile.d/ and included in ~/.bashrc or ~/.bash_profile for"
+ @${ECHO_MSG} "# each user"
+ @${ECHO_MSG} "#"
+ @${ECHO_MSG} "# . ${PREFIX}/etc/profile.d/infinality-settings.sh"
+ @${ECHO_MSG} "#"
+ @${ECHO_MSG} "# AFTER THEN EDIT THE FILE ${PREFIX}/etc/profile.d/infinality-settings.sh"
+ @${ECHO_MSG} "# AND SET THE VARIABLE USE_STYLE PRIOR IFs TO A OPTION FROM EXAMPLES"
+ @${ECHO_MSG} "#"
+ @${ECHO_MSG} "# WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
+ @${ECHO_MSG} "# WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
+ @${ECHO_MSG} "#"
+
+.endif
+
pre-configure:
@${REINPLACE_CMD} -e '/^LIBTOOL/s|LIBTOOL := $$(FT_LIBTOOL_DIR)/libtool|LIBTOOL := ${WRKDIR}/gnome-libtool|' \
${WRKSRC}/builds/unix/unix-cc.in
diff -ruN --exclude=CVS /usr/ports/print/freetype2/distinfo ./distinfo
--- /usr/ports/print/freetype2/distinfo 2013-05-22 14:57:15.000000000 -0300
+++ ./distinfo 2013-06-06 08:11:45.000000000 -0300
@@ -1,2 +1,4 @@
SHA256 (freetype-2.4.12.tar.bz2) = a78a17486689ab6852a9e1a759b179827ac9dfd7e2f237ddf169c73398c85381
SIZE (freetype-2.4.12.tar.bz2) = 1597205
+SHA256 (freetype-infinality-2.4.12-20130514_01-x86_64.tar.bz2) = 151973c65d9de980df9d39849b38132743ea7c44dcaadca16bfcf3daf7b7e2d1
+SIZE (freetype-infinality-2.4.12-20130514_01-x86_64.tar.bz2) = 38460
diff -ruN --exclude=CVS /usr/ports/print/freetype2/pkg-plist ./pkg-plist
--- /usr/ports/print/freetype2/pkg-plist 2013-05-22 14:57:15.000000000 -0300
+++ ./pkg-plist 2013-06-06 08:15:53.000000000 -0300
@@ -48,6 +48,7 @@
include/freetype2/freetype/tttables.h
include/freetype2/freetype/tttags.h
include/freetype2/freetype/ttunpat.h
+%%INF%%%%ETCDIR%%/infinality-settings.sh
include/ft2build.h
lib/libfreetype.a
lib/libfreetype.la
@@ -58,3 +59,4 @@
@dirrm include/freetype2/freetype/config
@dirrm include/freetype2/freetype
@dirrm include/freetype2
+%%INF%%@dirrm %%ETCDIR%%
===> Done
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306071226.r57CQk2e078326>