Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Feb 2000 07:36:16 +0900
From:      tkato@prontomail.ne.jp
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/16673: Update port: games/xmahjongg to 3.2
Message-ID:  <491CEF15431E3D11787300807CFDCBC0@tkato.prontomail.ne.jp>

next in thread | raw e-mail | index | archive | help

>Number:         16673
>Category:       ports
>Synopsis:       Update port: games/xmahjongg to 3.2
>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:   Sat Feb 12 14:50:06 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 3.4-RELEASE i386
>Organization:
>Environment:

>Description:
- Update to verion 3.2
- Add WWW: line into pkg/DESCR

Remove file:
patches/patch-aa  patches/patch-ab

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/games/xmahjongg/Makefile games/xmahjongg/Makefile
--- /usr/ports/games/xmahjongg/Makefile	Wed Aug 25 19:15:47 1999
+++ games/xmahjongg/Makefile	Fri Feb 11 16:45:58 2000
@@ -1,39 +1,21 @@
 # New ports collection makefile for:	xmahjongg
-# Version required:	
+# Version required:	3.2
 # Date created:		16 Aug 1996
 # Whom:			joerg@freebsd.org
 #
 # $FreeBSD: ports/games/xmahjongg/Makefile,v 1.7 1999/08/25 06:05:30 obrien Exp $
 #
 
-DISTNAME=	xmahjongg
-PKGNAME=	xmahjongg-1.0
+DISTNAME=	xmahjongg-3.2
 CATEGORIES=	games
-# Most Usenet archive sites don't store it as a .tar.gz, but Slackware
-# and it's mirrors do.
-MASTER_SITES=	ftp://ftp.digex.net/pub/os/linux/slackware/source/xap/xgames/ \
-		ftp://wcarchive.cdrom.com/pub/linux/slackware/source/xap/xgames/
+MASTER_SITES=	http://www.lcdf.org/xmahjongg/
 
 MAINTAINER=	joerg@freebsd.org
 
-WRKSRC=		${WRKDIR}/xmahjongg
-USE_IMAKE=	yes
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
 MAN6=		xmahjongg.6
 
 NO_CDROM=	"Restrictive copyright"
 
-.include <bsd.port.pre.mk>
-
-post-extract:
-	@${CP} ${WRKSRC}/xmahjongg.6 ${WRKSRC}/xmahjongg.man
-
-pre-install:
-.if !exists(${X11BASE}/lib/X11/fonts/local)
-	@${ECHO} "*********************************************************"
-	@${ECHO} "Please update your XFree86 to version 3.3.3 or later"
-	@${ECHO} "or add ${X11BASE}/lib/X11/fonts/local to your font path"
-	@${ECHO} "in /etc/XF86Config."
-	@${ECHO} "*********************************************************"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/games/xmahjongg/files/md5 games/xmahjongg/files/md5
--- /usr/ports/games/xmahjongg/files/md5	Wed Aug 28 05:16:32 1996
+++ games/xmahjongg/files/md5	Fri Feb 11 16:43:26 2000
@@ -1 +1 @@
-MD5 (xmahjongg.tar.gz) = 969200f399e9c5d28a7c1239a068fef0
+MD5 (xmahjongg-3.2.tar.gz) = 80958953120033362f91c0ef47c445ee
diff -urN /usr/ports/games/xmahjongg/patches/patch-aa games/xmahjongg/patches/patch-aa
--- /usr/ports/games/xmahjongg/patches/patch-aa	Tue Nov 17 20:19:54 1998
+++ games/xmahjongg/patches/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,31 +0,0 @@
---- Imakefile.orig	Sat Dec 11 03:35:21 1993
-+++ Imakefile	Fri Aug 16 18:41:38 1996
-@@ -5,7 +5,26 @@
- #	copyright laws of the United States.
- # 
- LOCAL_LIBRARIES = $(XLIB) 
--SRCS	= xmahjongg.c draw.c event.c initial.c packet.c play.c random.c sysdep.c variables.c
--OBJS	= xmahjongg.o draw.o event.o initial.o packet.o play.o random.o sysdep.o variables.o
-+         LAYOUT = $(LIBDIR)/xmahjongg
-+  EXTRA_DEFINES = -DLAYOUT=\"$(LAYOUT)\"
-+         BOARDS = bridge default wedges
-+           FONT = xmahjongg.bdf
-+      MANSUFFIX = 6
-+
-+SRCS	= xmahjongg.c draw.c event.c initial.c packet.c \
-+	play.c random.c sysdep.c variables.c
-+OBJS	= xmahjongg.o draw.o event.o initial.o packet.o \
-+	play.o random.o sysdep.o variables.o
-+
-+all:: $(FONT)
-+$(FONT): x.bdf.1 x.bdf.2 x.bdf.3
-+	@echo "Creating xmahjongg.bdf..."; \
-+	cat x.bdf.1 x.bdf.2 x.bdf.3 > $(FONT)
- 
- ComplexProgramTarget(xmahjongg)
-+InstallTarget(install,$(FONT),$(INSTDATFLAGS),$(FONTDIR)/local)
-+MakeDirectories(install,$(LAYOUT))
-+InstallMultipleDestFlags(install,$(BOARDS),$(LAYOUT),$(INSTDATFLAGS))
-+
-+install::
-+	RunProgram(MKFONTDIR,$(FONTDIR)/local)
diff -urN /usr/ports/games/xmahjongg/patches/patch-ab games/xmahjongg/patches/patch-ab
--- /usr/ports/games/xmahjongg/patches/patch-ab	Wed Aug 28 05:16:32 1996
+++ games/xmahjongg/patches/patch-ab	Thu Jan  1 09:00:00 1970
@@ -1,46 +0,0 @@
---- variables.c.orig	Sat Dec 11 03:35:04 1993
-+++ variables.c	Fri Aug 16 17:38:24 1996
-@@ -7,17 +7,18 @@
-  ******************************************************************************
-  */
- 
--#ifdef	GLOBAL
--#undef	GLOBAL
--#endif
--#define	GLOBAL 
--
- #include <pwd.h>
- #include <stdio.h>
- #include <string.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include "xmahjongg.h"
-+
-+#ifdef	GLOBAL
-+#undef	GLOBAL
-+#endif
-+#define	GLOBAL 
-+
- #include "variables.h"
- 
- variables()
---- xmahjongg.h.orig	Sun Jun 18 03:07:25 1995
-+++ xmahjongg.h	Fri Aug 16 17:47:28 1996
-@@ -14,7 +14,9 @@
- /*
-  *	Path used for layout files
-  */
-+#ifndef LAYOUT		/* to be passed from Imakefile */
- #define	LAYOUT		"/usr/X11R6/lib/xmahjongg"
-+#endif
- 
- /*
-  *	Fundamental definitions
-@@ -34,6 +36,7 @@
- #define FREE		0
- #define	USED		1
- 
-+#define GLOBAL		extern
- /*
-  *	Dimensions for boxes, tiles and options
-  */
diff -urN /usr/ports/games/xmahjongg/pkg/DESCR games/xmahjongg/pkg/DESCR
--- /usr/ports/games/xmahjongg/pkg/DESCR	Wed Aug 28 05:16:32 1996
+++ games/xmahjongg/pkg/DESCR	Fri Feb 11 16:40:28 2000
@@ -11,3 +11,5 @@
 or chrysanthemum) matches any other open "flower" tile and any open
 "season" tile (spring, summer, autumn, or winter) matches any other
 open "season" tile.
+
+WWW: http://www.lcdf.org/xmahjongg/
diff -urN /usr/ports/games/xmahjongg/pkg/PLIST games/xmahjongg/pkg/PLIST
--- /usr/ports/games/xmahjongg/pkg/PLIST	Tue Nov 17 20:19:54 1998
+++ games/xmahjongg/pkg/PLIST	Fri Feb 11 16:55:33 2000
@@ -1,8 +1,26 @@
 bin/xmahjongg
-lib/X11/xmahjongg/bridge
-lib/X11/xmahjongg/default
-lib/X11/xmahjongg/wedges
-@dirrm lib/X11/xmahjongg
-lib/X11/fonts/local/xmahjongg.bdf 
-@exec /usr/X11R6/bin/mkfontdir %B
-@unexec /usr/X11R6/bin/mkfontdir %B
+share/xmahjongg/backgrounds/default.gif
+share/xmahjongg/backgrounds/green.gif
+share/xmahjongg/layouts/arena
+share/xmahjongg/layouts/arrow
+share/xmahjongg/layouts/bridge
+share/xmahjongg/layouts/ceremonial
+share/xmahjongg/layouts/deepwell
+share/xmahjongg/layouts/default
+share/xmahjongg/layouts/farandole
+share/xmahjongg/layouts/hourglass
+share/xmahjongg/layouts/papillon
+share/xmahjongg/layouts/theater
+share/xmahjongg/layouts/wedges
+share/xmahjongg/tiles/dorothys.gif
+share/xmahjongg/tiles/dorwhite.gif
+share/xmahjongg/tiles/gnome.gif
+share/xmahjongg/tiles/gnome2.gif
+share/xmahjongg/tiles/real.gif
+share/xmahjongg/tiles/small.gif
+share/xmahjongg/tiles/thick.gif
+share/xmahjongg/tiles/thin.gif
+@dirrm share/xmahjongg/tiles
+@dirrm share/xmahjongg/layouts
+@dirrm share/xmahjongg/backgrounds
+@dirrm share/xmahjongg


Sent by Japanese ProntoMail

>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?491CEF15431E3D11787300807CFDCBC0>