svn commit: r355921 - head/vietnamese/unicode-uhoai
John Marino
marino at FreeBSD.org
Fri May 30 23:16:07 UTC 2014
Author: marino
Date: Fri May 30 23:16:06 2014
New Revision: 355921
URL: http://svnweb.freebsd.org/changeset/ports/355921
QAT: https://qat.redports.org/buildarchive/r355921/
Log:
vietnamese/unicode-uhoai: Fix deinstall and add stage support
This port had a few problems:
* The package list tried to remove the wrong directory
* The pkg-install script installs font.dir and font.scale files but
never tries to remove them. This causes orphan checks to fail
* The EXTRACTS_BEFORE_ARGS may not be additive (don't use +=)
* The EXTRACTS_BEFORE_ARGS definition came after <bsd.port.mk> so it
was never seen anyway
* The latter may mean that the font never installed properly if the
file didn't get transformed to lower case.
After staging, I added a pkg-deinstall script. I'm not 100% sure it's
correct if there are more than one Truetype font installed, but it's a
lot better than it was and it removes the font.* stuff upon deinstall.
This passes testport in poudriere.
Added:
head/vietnamese/unicode-uhoai/pkg-deinstall (contents, props changed)
Modified:
head/vietnamese/unicode-uhoai/Makefile
head/vietnamese/unicode-uhoai/pkg-plist
Modified: head/vietnamese/unicode-uhoai/Makefile
==============================================================================
--- head/vietnamese/unicode-uhoai/Makefile Fri May 30 22:08:55 2014 (r355920)
+++ head/vietnamese/unicode-uhoai/Makefile Fri May 30 23:16:06 2014 (r355921)
@@ -3,9 +3,8 @@
PORTNAME= unicode-uhoai
PORTVERSION= 2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= vietnamese x11-fonts
-#MASTER_SITES= http://www.geocities.com/~starkville/mozilla/
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= obrien
DISTNAME= uhoaiw21
@@ -21,14 +20,11 @@ BUILD_DEPENDS= ttmkfdir:${PORTSDIR}/x11-
bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-NO_STAGE= yes
+EXTRACT_BEFORE_ARGS= -qoL
+
do-install:
- @${MKDIR} ${PREFIX}/lib/X11/fonts/TrueType
+ @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/TrueType
${INSTALL_DATA} ${WRKSRC}/uhoaiw21.ttf \
- ${PREFIX}/lib/X11/fonts/TrueType
- @${SETENV} PKG_PREFIX=${PREFIX} \
- ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ ${STAGEDIR}${PREFIX}/lib/X11/fonts/TrueType
.include <bsd.port.mk>
-
-EXTRACT_BEFORE_ARGS+= -L
Added: head/vietnamese/unicode-uhoai/pkg-deinstall
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/vietnamese/unicode-uhoai/pkg-deinstall Fri May 30 23:16:06 2014 (r355921)
@@ -0,0 +1,13 @@
+#!/bin/sh
+# $FreeBSD$
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+ exit 0
+fi
+
+cd ${PKG_PREFIX}/lib/X11/fonts/TrueType
+${PKG_PREFIX}/bin/ttmkfdir -o fonts.scale
+if [ `cat fonts.scale` = "0" ]; then
+ rm -f fonts.scale
+ rm -f fonts.dir
+fi
Modified: head/vietnamese/unicode-uhoai/pkg-plist
==============================================================================
--- head/vietnamese/unicode-uhoai/pkg-plist Fri May 30 22:08:55 2014 (r355920)
+++ head/vietnamese/unicode-uhoai/pkg-plist Fri May 30 23:16:06 2014 (r355921)
@@ -1,2 +1,2 @@
lib/X11/fonts/TrueType/uhoaiw21.ttf
- at dirrm lib/X11/fonts/TrueType/vietnamese-unicode
+ at dirrmtry lib/X11/fonts/TrueType
More information about the svn-ports-all
mailing list