ports/170995: [PATCH] games/ttt: [SUMMARIZE CHANGES], take maintainership

nemysis nemysis at gmx.ch
Fri Aug 24 14:50:02 UTC 2012


>Number:         170995
>Category:       ports
>Synopsis:       [PATCH] games/ttt: [SUMMARIZE CHANGES], take maintainership
>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:   Fri Aug 24 14:50:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:

Makefile changed:                                                                                                                                                                                                   - two MASTER_SITES                                                                                        

- two MASTER_SITES

- changed LICENSE (GPLv2)

- changed to OptionsNG

- added
PLIST_FILES
PORTDATA=	*
SUB_FILES=	${PORTNAME}

- Take maintainership

Added file(s):
- files/patch-configure.ac
- files/ttt.in

Removed file(s):
- pkg-plist

Generated and tested manually, tested with port test and with RedPorts (all RELEASES), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- ttt-2011.04_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/ttt/Makefile ./Makefile
--- /usr/ports/games/ttt/Makefile	2012-02-18 11:18:17.000000000 +0100
+++ ./Makefile	2012-08-24 16:30:46.000000000 +0200
@@ -1,43 +1,58 @@
 # New ports collection makefile for:	ttt
-# Date created:				11 July 2005
-# Whom:					Alejandro Pulver <alejandro at varnet.biz>
+# Date created:		2005-07-11
+# Whom:			Alejandro Pulver <alejandro at varnet.biz>
 #
 # $FreeBSD: ports/games/ttt/Makefile,v 1.11 2012/02/18 10:18:17 mva Exp $
 #
 
 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 at FreeBSD.org
+MAINTAINER=	nemysis at 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>
diff -ruN --exclude=CVS /usr/ports/games/ttt/files/patch-configure.ac ./files/patch-configure.ac
--- /usr/ports/games/ttt/files/patch-configure.ac	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-configure.ac	2012-08-24 09:45:13.000000000 +0200
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2011-04-05 05:43:45.000000000 +0200
++++ configure.ac	2012-08-24 08:54:27.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))
diff -ruN --exclude=CVS /usr/ports/games/ttt/files/ttt.in ./files/ttt.in
--- /usr/ports/games/ttt/files/ttt.in	1970-01-01 01:00:00.000000000 +0100
+++ ./files/ttt.in	2012-08-24 14:28:15.000000000 +0200
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+echo "Tic Tac Toe: Starting up..."
+cd "%%DATADIR%%"
+./ttt
diff -ruN --exclude=CVS /usr/ports/games/ttt/pkg-descr ./pkg-descr
--- /usr/ports/games/ttt/pkg-descr	2011-10-24 06:15:52.000000000 +0200
+++ ./pkg-descr	2012-08-23 22:53:04.000000000 +0200
@@ -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/
diff -ruN --exclude=CVS /usr/ports/games/ttt/pkg-plist ./pkg-plist
--- /usr/ports/games/ttt/pkg-plist	2011-07-02 09:54:59.000000000 +0200
+++ ./pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-bin/ttt
-%%DATADIR%%/images/game_board.bmp
-%%DATADIR%%/images/human_vs_computer.bmp
-%%DATADIR%%/images/human_vs_human.bmp
-%%DATADIR%%/images/mark_o.bmp
-%%DATADIR%%/images/mark_x.bmp
-%%DATADIR%%/images/program_logo.bmp
-%%DATADIR%%/images/status_draw.bmp
-%%DATADIR%%/images/status_win_o.bmp
-%%DATADIR%%/images/status_win_x.bmp
-%%DATADIR%%/images/turn_o.bmp
-%%DATADIR%%/images/turn_x.bmp
- at dirrm %%DATADIR%%/images
- at dirrm %%DATADIR%%
--- ttt-2011.04_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list