From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 29 21:10:04 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 073CB106568B for ; Thu, 29 Jan 2009 21:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C86FC8FC1C for ; Thu, 29 Jan 2009 21:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TLA3lZ051624 for ; Thu, 29 Jan 2009 21:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n0TLA3OW051623; Thu, 29 Jan 2009 21:10:03 GMT (envelope-from gnats) Resent-Date: Thu, 29 Jan 2009 21:10:03 GMT Resent-Message-Id: <200901292110.n0TLA3OW051623@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gabor PALI Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 781CC106564A for ; Thu, 29 Jan 2009 21:01:07 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 4B8EC8FC1D for ; Thu, 29 Jan 2009 21:01:07 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TL17u6013469 for ; Thu, 29 Jan 2009 21:01:07 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n0TL17dd013468; Thu, 29 Jan 2009 21:01:07 GMT (envelope-from nobody) Message-Id: <200901292101.n0TL17dd013468@www.freebsd.org> Date: Thu, 29 Jan 2009 21:01:07 GMT From: Gabor PALI To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/131135: [UPDATE] x11/hs-x11-xft-ghc - Improve PORTDOCS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jan 2009 21:10:10 -0000 >Number: 131135 >Category: ports >Synopsis: [UPDATE] x11/hs-x11-xft-ghc - Improve PORTDOCS >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: Thu Jan 29 21:10:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Gabor PALI >Release: 7.1-STABLE >Organization: The FreeBSD Project >Environment: FreeBSD xxx 7.1-STABLE FreeBSD 7.1-STABLE #1: Fri Jan 23 20:38:51 CET 2009 xxx:/usr/obj/usr/src/sys/NON-GENERIC i386 >Description: Improve PORTDOCS support for the port (makes it easier to maintain). >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/x11/hs-x11-xft-ghc/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- Makefile 23 Nov 2008 08:22:31 -0000 1.1 +++ Makefile 29 Jan 2009 20:48:44 -0000 @@ -7,6 +7,7 @@ PORTNAME= x11-xft PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= x11 haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/X11-xft/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -33,11 +34,15 @@ PORTNAME=${PORTNAME} \ SUBDIR=lib/ghc-${GHC_VERSION}/cabal DOCSDIR= ${PREFIX}/share/doc/X11-xft-${PORTVERSION} +PORTDOCS= LICENSE html CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${CABALDIR} --libsubdir='' --datasubdir='' -.ifndef (NOPORTDOCS) +.if !defined(NOPORTDOCS) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.else +PLIST_DIRS+= %%DOCSDIR%% +PLIST_FILES+= %%DOCSDIR%%/LICENSE .endif do-configure: @@ -45,7 +50,7 @@ do-build: cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register -.ifndef (NOPORTDOCS) +.if !defined(NOPORTDOCS) cd ${WRKSRC} && ${CABALCMD} haddock .endif Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/x11/hs-x11-xft-ghc/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 23 Nov 2008 08:22:31 -0000 1.1 +++ pkg-plist 29 Jan 2009 20:48:44 -0000 @@ -3,22 +3,9 @@ %%SUBDIR%%/HSX11-xft-0.3.o %%SUBDIR%%/libHSX11-xft-0.3.a %%SUBDIR%%/x11-xft-register.sh -%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xft.html -%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xrender.html -%%PORTDOCS%%%%DOCSDIR%%/html/X11-xft.haddock -%%PORTDOCS%%%%DOCSDIR%%/html/doc-index.html -%%PORTDOCS%%%%DOCSDIR%%/html/haddock-util.js -%%PORTDOCS%%%%DOCSDIR%%/html/haddock.css -%%PORTDOCS%%%%DOCSDIR%%/html/haskell_icon.gif -%%PORTDOCS%%%%DOCSDIR%%/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/minus.gif -%%PORTDOCS%%%%DOCSDIR%%/html/plus.gif -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html -@dirrm %%DOCSDIR%% @dirrmtry %%SUBDIR%%/Graphics/X11 @dirrmtry %%SUBDIR%%/Graphics @exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec %D/bin/ghc-pkg unregister X11-xft +@unexec ghc-pkg unregister X11-xft @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old >Release-Note: >Audit-Trail: >Unformatted: