Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Feb 2000 07:35:30 +0900
From:      tkato@prontomail.ne.jp
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/16671: Update port: games/xjewel
Message-ID:  <B81CEF15431E3D11787300807CFDCBC0@tkato.prontomail.ne.jp>

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

>Number:         16671
>Category:       ports
>Synopsis:       Update port: games/xjewel
>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:05 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 3.4-RELEASE i386
>Organization:
>Environment:

>Description:
- Fix MASTER_SITES
- Support CFLAGS properly

New file:
patches/patch-aa

Remove file:
scripts/configure

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/games/xjewel/Makefile games/xjewel/Makefile
--- /usr/ports/games/xjewel/Makefile	Sat Aug 28 19:20:51 1999
+++ games/xjewel/Makefile	Fri Feb 11 16:36:26 2000
@@ -1,14 +1,15 @@
-# New ports collection makefile for:    xjewel
-# Version required:     1.6
-# Date created:         22 November 1994
-# Whom:                 jmz
+# New ports collection makefile for:	xjewel
+# Version required:	1.6
+# Date created:		22 November 1994
+# Whom:			jmz
 #
 # $FreeBSD: ports/games/xjewel/Makefile,v 1.16 1999/08/28 02:41:48 mharo Exp $
 #
 
 DISTNAME=	xjewel-1.6
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/x11/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
+		ftp://ftp.cdrom.com/pub/X11/R5contrib/
 EXTRACT_SUFX=	.tar.z
 
 MAINTAINER=	jmz@FreeBSD.org
@@ -16,18 +17,11 @@
 USE_IMAKE=	yes
 MAN6=		xjewel.6
 
-pre-install:
-	@${MKDIR} ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/lib/X11/xjewel
-	@${MKDIR} ${PREFIX}/man/man6
-	@(cd ${WRKSRC}/bitmaps/; ${INSTALL_DATA} seven_seg.pcf.gz fonts.dir \
-		${PREFIX}/lib/X11/xjewel)
+FONTSDIR=	lib/X11/fonts/local
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
 post-install:
-	@(${MV} ${PREFIX}/bin/xjewel ${PREFIX}/bin/xjewel_; \
-	$(ECHO) "#!/bin/sh" >${PREFIX}/bin/xjewel; \
-	$(ECHO) "xset +fp ${PREFIX}/lib/X11/xjewel" >>${PREFIX}/bin/xjewel; \
-	$(ECHO) "${PREFIX}/bin/xjewel_" >>${PREFIX}/bin/xjewel; \
-	${CHMOD} ugo+x ${PREFIX}/bin/xjewel)
+	${INSTALL_DATA} ${WRKSRC}/bitmaps/seven_seg.pcf.gz ${PREFIX}/${FONTSDIR}
+	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/xjewel/patches/patch-aa games/xjewel/patches/patch-aa
--- /usr/ports/games/xjewel/patches/patch-aa	Thu Jan  1 09:00:00 1970
+++ games/xjewel/patches/patch-aa	Fri Feb 11 13:58:00 2000
@@ -0,0 +1,46 @@
+--- Imakefile.orig	Wed Feb 16 19:35:06 1994
++++ Imakefile	Fri Feb 11 13:57:31 2000
+@@ -1,11 +1,12 @@
+ # A little makeyfile edit up to the solid line...
+ 
+ # EDIT THE CDEBUGFLAGS IF -O GIVES A PROBLEM
+-CDEBUGFLAGS = -O  
++# CDEBUGFLAGS = -O  
+ 
+ # CHANGE HSCORE_FILE TO SUIT
+ #HSCORE_FILE=/usr/local/lib/xjewel.scores
+-HSCORE_FILE=xjewel.scores
++HSCORE_DIR=$(LIBDIR)/xjewel
++HSCORE_FILE=$(HSCORE_DIR)/xjewel.scores
+ 
+ # ADD YOUR ARCHITECTURE IF YOU USE SELECT INSTEAD OF POLL
+ #if defined(HPArchitecture) || defined(ApolloArchitecture) || \
+@@ -21,10 +22,10 @@
+ # DEFINE 'GETPWENT' if you dont have the cuserid ftn (hscore.c)
+ # DEFINE 'SLOW_FONTS=n' if your server is overly fast on fonts
+ # DEFINE 'SLOW_DRAW=n' if your server is overly fast on drawing
+-USERDEFS = -DICON_WINDOW
++USERDEFS = -DICON_WINDOW -DUSE_SELECT -DGETPWENT
+ 
+ # CHANGE FFILE TO REFLECT THE EXTENSION USED FOR COMPILED FONTS
+-FFILE = snf
++FFILE = pcf.gz
+ 
+ ##############################################################################
+ # X-STUFF...
+@@ -40,6 +41,8 @@
+ FONT   = bitmaps/seven_seg
+ CFONT   = bitmaps/seven_seg.$(FFILE)
+ 
++MANDIR = $(MANPATH)/man6
++MANSUFFIX = 6
+ 
+ # LETS GET TO IT...
+ ComplexProgramTarget(xjewel)
+@@ -52,5 +55,6 @@
+ all:: $(CFONT)
+ 
+ install::
++	MakeDir($(DESTDIR)$(HSCORE_DIR))
+ 	touch  $(HSCORE_FILE)
+ 	chmod a+w $(HSCORE_FILE)
diff -urN /usr/ports/games/xjewel/pkg/PLIST games/xjewel/pkg/PLIST
--- /usr/ports/games/xjewel/pkg/PLIST	Mon Sep 28 19:24:33 1998
+++ games/xjewel/pkg/PLIST	Fri Feb 11 13:44:00 2000
@@ -1,6 +1,6 @@
 bin/xjewel
-bin/xjewel_
-lib/X11/xjewel.scores
-lib/X11/xjewel/fonts.dir
-lib/X11/xjewel/seven_seg.pcf.gz
+lib/X11/xjewel/xjewel.scores
+%%FONTSDIR%%/seven_seg.pcf.gz
+@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
 @dirrm lib/X11/xjewel
diff -urN /usr/ports/games/xjewel/scripts/configure games/xjewel/scripts/configure
--- /usr/ports/games/xjewel/scripts/configure	Thu May 14 07:29:44 1998
+++ games/xjewel/scripts/configure	Thu Jan  1 09:00:00 1970
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-cd $WRKSRC || exit 1;
-
-mv Imakefile Imakefile.orig
-sed -e s/snf/pcf.gz/  <Imakefile.orig>Imakefile
-
-cat >> Imakefile <<END
-
-HSCORE_FILE = $PREFIX/lib/X11/xjewel.scores
-USERDEFS = -DICON_WINDOW -DUSE_SELECT -DGETPWENT
-BINDIR = $PREFIX/bin
-MANDIR = $PREFIX/man/man6
-MANSUFFIX = 6
-END
-
-exit 0;


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?B81CEF15431E3D11787300807CFDCBC0>