Update to 1.05.2.20091227.

PR:		ports/142777
Submitted by:	keramida

3 files changed, 10 insertions, 18 deletions

diff --git a/x11-fonts/liberation-fonts-ttf/Makefile b/x11-fonts/liberation-fonts-ttf/Makefile
index 4befc26ee097..2b06153e428e 100644
--- a/x11-fonts/liberation-fonts-ttf/Makefile
+++ b/x11-fonts/liberation-fonts-ttf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	liberation-fonts-ttf
-PORTVERSION=	1.05.1.20090721
+PORTVERSION=	1.05.2.20091227
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://fedorahosted.org/releases/l/i/liberation-fonts/
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
 USE_XORG=	x11
-USE_ZIP=	yes	# The 1.05.1.20090721 tarball is broken
 
 NO_WRKSUBDIR=	yes
 PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
@@ -29,22 +28,20 @@ SUB_LIST=	FONTDIR=${FONTDIR}
 
 FONTNAME=	Liberation
 FONTDIR=	${PREFIX}/lib/X11/fonts/${FONTNAME}
-INSTDAT=	AUTHORS License.txt fonts.dir fonts.scale
+INSTDAT=	AUTHORS License.txt ttf/fonts.dir ttf/fonts.scale
 
 MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
 MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
 
 do-build:
-	cd ${WRKSRC} &&	\
-	${MKFONTSCL_CMD}
-	${REINPLACE_CMD} -e 's|-misc-|-redhat-|' ${WRKSRC}/fonts.scale
-	cd ${WRKSRC} &&	\
-	${MKFONTDIR_CMD}
+	cd ${WRKSRC}/ttf && ${MKFONTSCL_CMD}
+	${REINPLACE_CMD} -e 's|-misc-|-redhat-|' ${WRKSRC}/ttf/fonts.scale
+	cd ${WRKSRC}/ttf && ${MKFONTDIR_CMD}
 
 do-install:
 	${MKDIR} ${FONTDIR}
 	cd ${WRKSRC} &&	\
-	${INSTALL_DATA} ${INSTDAT} *.ttf ${FONTDIR}
+	${INSTALL_DATA} ${INSTDAT} ttf/*.ttf ${FONTDIR}
 
 post-install:
 	@${ECHO_MSG}
diff --git a/x11-fonts/liberation-fonts-ttf/distinfo b/x11-fonts/liberation-fonts-ttf/distinfo
index ea1f06a3612a..013ee130c69e 100644
--- a/x11-fonts/liberation-fonts-ttf/distinfo
+++ b/x11-fonts/liberation-fonts-ttf/distinfo
@@ -1,3 +1,3 @@
-MD5 (liberation-fonts-ttf-1.05.1.20090721.zip) = be344fa977332133ea5d6fbddfe0f216
-SHA256 (liberation-fonts-ttf-1.05.1.20090721.zip) = b0f69bfbe4d35eb5af2d22b8ce3445b3c8beee5a9ce0f4a4fee7d12fe9592d34
-SIZE (liberation-fonts-ttf-1.05.1.20090721.zip) = 1049067
+MD5 (liberation-fonts-ttf-1.05.2.20091227.tar.gz) = c61feadcb9195f5a111de4018b85b974
+SHA256 (liberation-fonts-ttf-1.05.2.20091227.tar.gz) = 2c4a413059930ea6a5fdde4b6f2cc49521f6c197040ade42efd10bf8a9c79a10
+SIZE (liberation-fonts-ttf-1.05.2.20091227.tar.gz) = 1037481
diff --git a/x11-fonts/liberation-fonts-ttf/files/pkg-message.in b/x11-fonts/liberation-fonts-ttf/files/pkg-message.in
index 9c1334d88b56..dca252c8f1d3 100644
--- a/x11-fonts/liberation-fonts-ttf/files/pkg-message.in
+++ b/x11-fonts/liberation-fonts-ttf/files/pkg-message.in
@@ -1,10 +1,5 @@
 You can start using the fonts by following these instructions:
 
-Make sure that the freetype module is loaded.  If it is not, add the following
-line to the "Modules" section of your X11 / x.org configuration file:
-
-	Load "freetype"
-
-Add the following line to the "Files" section:
+Add the following line to the "Files" section of your x.org configuration file:
 
 	FontPath "%%FONTDIR%%/"