From owner-svn-ports-head@FreeBSD.ORG Fri May 30 23:16:07 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0C667BB9; Fri, 30 May 2014 23:16:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E13C12A63; Fri, 30 May 2014 23:16:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4UNG6Qt037687; Fri, 30 May 2014 23:16:06 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4UNG6j7037684; Fri, 30 May 2014 23:16:06 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201405302316.s4UNG6j7037684@svn.freebsd.org> From: John Marino Date: Fri, 30 May 2014 23:16:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355921 - head/vietnamese/unicode-uhoai X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 May 2014 23:16:07 -0000 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 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 - -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 -@dirrm lib/X11/fonts/TrueType/vietnamese-unicode +@dirrmtry lib/X11/fonts/TrueType