Date: Fri, 10 Nov 2000 06:39:20 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/22746: Update port: games/yahtzee Message-ID: <20001110143920.373D637B4C5@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 22746
>Category: ports
>Synopsis: Update port: games/yahtzee
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 10 06:40:02 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.1.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CFLAGS/PREFIX properly
- freebsd.org -> FreeBSD.org
- Change location of data files from lib/ to share/
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/yahtzee/Makefile games/yahtzee/Makefile
--- /usr/ports/games/yahtzee/Makefile Mon Oct 30 23:37:51 2000
+++ games/yahtzee/Makefile Fri Nov 10 23:39:11 2000
@@ -1,28 +1,28 @@
-# New ports collection makefile for: yahtzee
+# New ports collection makefile for: yahtzee
# Date created: Friday 4th July, 1997
# Whom: Joel Sutton <sutton@aardvark.apana.org.au>
-# FreeBSD Version: 2.2.1-RELEASE
#
# $FreeBSD: ports/games/yahtzee/Makefile,v 1.6 2000/10/29 06:31:36 dougb Exp $
#
-PORTNAME= yahtzee
-PORTVERSION= 1.0
-CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
+PORTNAME= yahtzee
+PORTVERSION= 1.0
+PORTREVISION= 1
+CATEGORIES= games
+MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/strategy
-DISTFILES= yahtzee-src.tar.Z
+DISTNAME= ${PORTNAME}-src
+EXTRACT_SUFX= .tar.Z
-MAINTAINER= ports@freebsd.org
+MAINTAINER= ports@FreeBSD.org
-WRKSRC= ${WRKDIR}/yahtzee
+WRKSRC= ${WRKDIR}/${PORTNAME}
# Distribution does not include an install target. So here it is.
#
do-install:
- ${INSTALL_PROGRAM} -m 2755 -o root -g games ${WRKSRC}/yahtzee ${PREFIX}/bin/
- ${MKDIR} -m 0755 ${PREFIX}/lib/yahtzee/
- ${INSTALL_DATA} -m 0664 -o root -g games /dev/null ${PREFIX}/lib/yahtzee/yahtzee.sco
+ ${INSTALL_PROGRAM} -m 2755 -o root -g games ${WRKSRC}/yahtzee ${PREFIX}/bin
+ ${MKDIR} -m 0755 ${PREFIX}/share/yahtzee
+ ${INSTALL_DATA} -m 0664 -o root -g games /dev/null ${PREFIX}/share/yahtzee/yahtzee.sco
.include <bsd.port.mk>
-
diff -urN /usr/ports/games/yahtzee/files/patch-aa games/yahtzee/files/patch-aa
--- /usr/ports/games/yahtzee/files/patch-aa Fri Jul 4 18:36:40 1997
+++ games/yahtzee/files/patch-aa Wed Nov 8 04:48:49 2000
@@ -1,22 +1,21 @@
-*** Makefile.orig Sun Apr 13 14:17:07 1997
---- Makefile Sun Apr 13 14:17:54 1997
-***************
-*** 1,4 ****
-! CFLAGS =
-
- OBJ = computer.o main.o
-
---- 1,4 ----
-! CFLAGS = -O -DHAS_RENAME
-
- OBJ = computer.o main.o
-
-***************
-*** 13,15 ****
---- 13,17 ----
- rm -f $(OBJ) $(BIN)
-
- $(OBJ): yahtzee.h config.h
-+
-+ all: $(BIN) $(OBJ)
-\ No newline at end of file
+--- Makefile.orig Sat Jan 25 17:45:26 1992
++++ Makefile Wed Nov 8 04:48:42 2000
+@@ -1,4 +1,4 @@
+-CFLAGS =
++CFLAGS += -DHAS_RENAME -DSCOREDIR=\"$(PREFIX)/share/yahtzee\"
+
+ OBJ = computer.o main.o
+
+@@ -7,9 +7,11 @@
+ BIN = yahtzee
+
+ $(BIN): $(OBJ)
+- cc -o $@ $(OBJ) -lcurses
++ $(CC) -o $@ $(OBJ) -lcurses
+
+ clean:
+ rm -f $(OBJ) $(BIN)
+
+ $(OBJ): yahtzee.h config.h
++
++all: $(BIN) $(OBJ)
diff -urN /usr/ports/games/yahtzee/files/patch-ab games/yahtzee/files/patch-ab
--- /usr/ports/games/yahtzee/files/patch-ab Fri Jul 4 18:36:40 1997
+++ games/yahtzee/files/patch-ab Wed Nov 8 04:48:03 2000
@@ -1,19 +1,12 @@
-*** config.h.orig Sun Apr 13 13:48:41 1997
---- config.h Sun Apr 13 13:48:54 1997
-***************
-*** 1,7 ****
- #ifndef _config_H_
- #define _config_H_
-
-! #define SCOREDIR "/usr/local/lib"
- #define SCOREFNAME "yahtzee.sco" /* must allow .L extension */
-
- #define NUM_TOP_PLAYERS 10
---- 1,7 ----
- #ifndef _config_H_
- #define _config_H_
-
-! #define SCOREDIR "/usr/local/lib/yahtzee"
- #define SCOREFNAME "yahtzee.sco" /* must allow .L extension */
-
- #define NUM_TOP_PLAYERS 10
+--- config.h.orig Sat Jan 25 17:41:05 1992
++++ config.h Wed Nov 8 04:47:56 2000
+@@ -1,7 +1,9 @@
+ #ifndef _config_H_
+ #define _config_H_
+
++#ifndef SCOREDIR
+ #define SCOREDIR "/usr/local/lib"
++#endif
+ #define SCOREFNAME "yahtzee.sco" /* must allow .L extension */
+
+ #define NUM_TOP_PLAYERS 10
diff -urN /usr/ports/games/yahtzee/pkg-plist games/yahtzee/pkg-plist
--- /usr/ports/games/yahtzee/pkg-plist Mon Sep 28 11:34:32 1998
+++ games/yahtzee/pkg-plist Wed Nov 8 04:52:36 2000
@@ -1,3 +1,3 @@
bin/yahtzee
-lib/yahtzee/yahtzee.sco
-@dirrm lib/yahtzee
+share/yahtzee/yahtzee.sco
+@dirrm share/yahtzee
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001110143920.373D637B4C5>