From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 9 17:30:05 2010 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 0F2B51065679 for ; Sat, 9 Jan 2010 17:30:05 +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 DF5ED8FC1E for ; Sat, 9 Jan 2010 17:30:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o09HU4kI051055 for ; Sat, 9 Jan 2010 17:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o09HU47d051052; Sat, 9 Jan 2010 17:30:04 GMT (envelope-from gnats) Resent-Date: Sat, 9 Jan 2010 17:30:04 GMT Resent-Message-Id: <201001091730.o09HU47d051052@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, Sevan Janiyan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F795106566B for ; Sat, 9 Jan 2010 17:26:44 +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 73F578FC1A for ; Sat, 9 Jan 2010 17:26:44 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o09HQi72073729 for ; Sat, 9 Jan 2010 17:26:44 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o09HQi3V073728; Sat, 9 Jan 2010 17:26:44 GMT (envelope-from nobody) Message-Id: <201001091726.o09HQi3V073728@www.freebsd.org> Date: Sat, 9 Jan 2010 17:26:44 GMT From: Sevan Janiyan To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/142530: [patch] games/grubinvaders switch to using DOCSDIR DATADIR in Makefile aswell as $SUB_FILES to dynamically adjust pkg-message 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: Sat, 09 Jan 2010 17:30:05 -0000 >Number: 142530 >Category: ports >Synopsis: [patch] games/grubinvaders switch to using DOCSDIR DATADIR in Makefile aswell as $SUB_FILES to dynamically adjust pkg-message >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Jan 09 17:30:04 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Sevan Janiyan >Release: >Organization: >Environment: >Description: >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/games/grubinvaders/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 24 Mar 2006 06:23:42 -0000 1.4 +++ Makefile 9 Jan 2010 17:20:08 -0000 @@ -21,11 +21,14 @@ STRIP= WRKSRC= ${WRKDIR}/invaders ALL_TARGET= clean all +SUB_FILES= pkg-message do-install: - ${MKDIR} ${PREFIX}/share/grubinvaders - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/grubinvaders - ${INSTALL_PROGRAM} ${WRKSRC}/invaders ${PREFIX}/share/grubinvaders - @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE} + ${MKDIR} ${DATADIR} +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} +.endif + ${INSTALL_PROGRAM} ${WRKSRC}/invaders ${DATADIR} .include Index: pkg-message =================================================================== RCS file: pkg-message diff -N pkg-message --- pkg-message 14 Apr 2002 00:36:17 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,6 +0,0 @@ ------------------------------------------------------------- - -See %%PREFIX%%/share/grubinvaders/README for instructions on -installing grubinvaders with grub. - ------------------------------------------------------------- Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/games/grubinvaders/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 14 Apr 2002 00:36:17 -0000 1.1 +++ pkg-plist 9 Jan 2010 17:20:08 -0000 @@ -1,3 +1,4 @@ -share/grubinvaders/README -share/grubinvaders/invaders -@dirrm share/grubinvaders +%%PORTDOCS%%%%DOCSDIR%%/README +%%DATADIR%%/invaders +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%% Index: files/pkg-message.in =================================================================== RCS file: files/pkg-message.in diff -N files/pkg-message.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-message.in 9 Jan 2010 17:20:08 -0000 @@ -0,0 +1,6 @@ +------------------------------------------------------------ + +See %%DATADIR%%/README for instructions on +installing grubinvaders with grub. + +------------------------------------------------------------ >Release-Note: >Audit-Trail: >Unformatted: