From owner-svn-ports-head@FreeBSD.ORG  Sat Sep 22 19:52:32 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0A5641065673;
	Sat, 22 Sep 2012 19:52:32 +0000 (UTC)
	(envelope-from bsam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E9CF88FC08;
	Sat, 22 Sep 2012 19:52:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8MJqVLb029819;
	Sat, 22 Sep 2012 19:52:31 GMT (envelope-from bsam@svn.freebsd.org)
Received: (from bsam@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8MJqVFL029817;
	Sat, 22 Sep 2012 19:52:31 GMT (envelope-from bsam@svn.freebsd.org)
Message-Id: <201209221952.q8MJqVFL029817@svn.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Sat, 22 Sep 2012 19:52:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304719 - head/games/patapizza-tetris
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Sep 2012 19:52:32 -0000

Author: bsam
Date: Sat Sep 22 19:52:31 2012
New Revision: 304719
URL: http://svn.freebsd.org/changeset/ports/304719

Log:
  . remove options (the port should not be used without DATA);
  . simplify DOC installation.
  
  Submitted by:	nemysis@gmx.ch (maintainer, via e-mail)

Modified:
  head/games/patapizza-tetris/Makefile

Modified: head/games/patapizza-tetris/Makefile
==============================================================================
--- head/games/patapizza-tetris/Makefile	Sat Sep 22 19:46:26 2012	(r304718)
+++ head/games/patapizza-tetris/Makefile	Sat Sep 22 19:52:31 2012	(r304719)
@@ -12,9 +12,6 @@ COMMENT=	Unofficial clone of the origina
 
 LICENSE=	GPLv3
 
-OPTIONS_DEFINE=	DATA
-OPTIONS_DEFAULT=DATA
-
 FETCH_ARGS?=	-Fpr
 USE_GMAKE=	yes
 USE_SDL=	sdl image gfx ttf
@@ -27,11 +24,11 @@ PORTDOCS=	README.md
 
 SUB_FILES=	${PORTNAME}.sh
 
-post-patch:
-	${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKSRC}/Makefile
-
 .include <bsd.port.options.mk>
 
+post-patch:
+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Makefile
+
 do-build:
 	cd ${WRKSRC} && ${CC} -o ${PORTNAME} ${CFLAGS} \
 		-DDATA_PREFIX=\"${DATADIR}/\" \
@@ -46,9 +43,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
 
 # Data
-.if ${PORT_OPTIONS:MDATA}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} images ${DATADIR})
-.endif
 
 # Pixmaps
 	${INSTALL_DATA} ${WRKSRC}/images/logo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
@@ -56,9 +51,7 @@ do-install:
 # Documentation
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-.  for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.  endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>