- Support CFLAGS/PREFIX properly

- freebsd.org -> FreeBSD.org
- Change location of data files from lib/ to share/

PR: 22746
Submitted by: Ports Fury

4 files changed, 48 insertions, 56 deletions

diff --git a/games/yahtzee/Makefile b/games/yahtzee/Makefile
index 15252125cf47..6711cf6a68f7 100644
--- a/games/yahtzee/Makefile
+++ b/games/yahtzee/Makefile
@@ -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$
 #
 
-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 --git a/games/yahtzee/files/patch-aa b/games/yahtzee/files/patch-aa
index 5e85bd895ac3..c2eb5261af80 100644
--- a/games/yahtzee/files/patch-aa
+++ b/games/yahtzee/files/patch-aa
@@ -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 --git a/games/yahtzee/files/patch-ab b/games/yahtzee/files/patch-ab
index 368cced98698..5f2e4544d659 100644
--- a/games/yahtzee/files/patch-ab
+++ b/games/yahtzee/files/patch-ab
@@ -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 --git a/games/yahtzee/pkg-plist b/games/yahtzee/pkg-plist
index f36de1e4643e..95324a34ae8c 100644
--- a/games/yahtzee/pkg-plist
+++ b/games/yahtzee/pkg-plist
@@ -1,3 +1,3 @@
 bin/yahtzee
-lib/yahtzee/yahtzee.sco
-@dirrm lib/yahtzee
+share/yahtzee/yahtzee.sco
+@dirrm share/yahtzee