Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Sep 2012 22:08:43 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r304004 - in head/games/ttt: . files
Message-ID:  <201209092208.q89M8hSl045272@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Sun Sep  9 22:08:43 2012
New Revision: 304004
URL: http://svn.freebsd.org/changeset/ports/304004

Log:
  - Add second MASTER_SITE
  - changed LICENSE (GPLv2)
  - changed to OptionsNG
  - Use PLIST_FILES instead of pkg_plist due to short package list
  - Give maintainership to submitter
  
  PR:		ports/170995
  Submitted by:	nemysis <nemysis@gmx.ch>

Added:
  head/games/ttt/files/
  head/games/ttt/files/patch-configure.ac   (contents, props changed)
  head/games/ttt/files/ttt.in   (contents, props changed)
Deleted:
  head/games/ttt/pkg-plist
Modified:
  head/games/ttt/Makefile   (contents, props changed)
  head/games/ttt/pkg-descr   (contents, props changed)

Modified: head/games/ttt/Makefile
==============================================================================
--- head/games/ttt/Makefile	Sun Sep  9 21:47:00 2012	(r304003)
+++ head/games/ttt/Makefile	Sun Sep  9 22:08:43 2012	(r304004)
@@ -7,37 +7,52 @@
 
 PORTNAME=	ttt
 PORTVERSION=	2011.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/ttt/
+MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/ttt/ \
+		ftp://ftp.billsgames.com/unix/x/ttt/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Simple one or two player Tic Tac Toe game
 
-# net/ttt
-CONFLICTS=	ttt-1*
-NO_LATEST_LINK=	yes
+LICENSE=	GPLv2
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
-
-USE_SDL=	sdl
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	aclocal automake autoheader autoconf
 AUTOMAKE_ARGS=	--add-missing --force
-MAKE_JOBS_SAFE=	yes
+ALL_TARGET=	${PORTNAME}
+USE_SDL=	mixer sdl
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		'/SDL_mixer/d' ${WRKSRC}/configure.ac
-	@${REINPLACE_CMD} -e \
-		's|\./images|${DATADIR}/images|g' ${WRKSRC}/src/init.c
-
-post-install:
-	@${MKDIR} ${DATADIR}/images
-	${INSTALL_DATA} ${WRKSRC}/images/*.bmp ${DATADIR}/images
+PLIST_FILES=	bin/${PORTNAME} \
+		share/pixmaps/${PORTNAME}.bmp
+
+PORTDATA=	*
+PORTDOCS=	README
+
+SUB_FILES=	${PORTNAME}
+
+.include <bsd.port.options.mk>
+
+do-install:
+# Scripts
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+
+# Executable
+	${MKDIR} ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
+
+# Data
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "images sounds" ${DATADIR})
+
+# Pixmaps
+	${INSTALL_DATA} ${WRKSRC}/images/program_logo.bmp ${PREFIX}/share/pixmaps/${PORTNAME}.bmp
+
+# Documentation
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>

Added: head/games/ttt/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/ttt/files/patch-configure.ac	Sun Sep  9 22:08:43 2012	(r304004)
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2011-04-05 05:43:45.000000000 +0200
++++ configure.ac	2012-09-09 04:55:17.000000000 +0200
+@@ -44,6 +44,7 @@
+ AC_PROG_MKDIR_P
+ AC_PROG_SED
+ LT_INIT
++AC_SUBST([LIBTOOL_DEPS])
+ 
+ dnl AC_CHECK_LIB([duma],		[_duma_malloc]		,,AC_MSG_ERROR(missing library))
+ AC_CHECK_LIB([SDL],		[SDL_Init]		,,AC_MSG_ERROR(missing library))

Added: head/games/ttt/files/ttt.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/ttt/files/ttt.in	Sun Sep  9 22:08:43 2012	(r304004)
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+echo "Tic Tac Toe: Starting up..."
+cd "%%DATADIR%%"
+./ttt

Modified: head/games/ttt/pkg-descr
==============================================================================
--- head/games/ttt/pkg-descr	Sun Sep  9 21:47:00 2012	(r304003)
+++ head/games/ttt/pkg-descr	Sun Sep  9 22:08:43 2012	(r304004)
@@ -1,6 +1,3 @@
-TTT (Tic-Tac-Toe)
-
-"ttt" is a very simple one - or two - player Tic Tac Toe game played using a
-mouse.
+ttt is a very simple one- or two-player Tic Tac Toe game played using a mouse.
 
 WWW: http://www.newbreedsoftware.com/ttt/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209092208.q89M8hSl045272>