Skip site navigation (1)Skip section navigation (2)
Date:      Mon,  4 Sep 2000 12:12:15 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/21034: Update port: games/xworm
Message-ID:  <20000904191215.6721237B422@hub.freebsd.org>

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

>Number:         21034
>Category:       ports
>Synopsis:       Update port: games/xworm
>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:   Mon Sep 04 12:20:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CFLAGS/PREFIX/X11BASE properly

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/games/xworm/Makefile games/xworm/Makefile
--- /usr/ports/games/xworm/Makefile	Sat Apr 15 00:24:44 2000
+++ games/xworm/Makefile	Wed Aug 30 20:24:53 2000
@@ -9,19 +9,19 @@
 PORTVERSION=	1.02
 CATEGORIES=	games
 MASTER_SITES=	http://www.ekran.no/archive/x/
-DISTNAME=	xworm102
+DISTNAME=	${PORTNAME}102
 
 MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=	freebsd
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/XWorm
+USE_X_PREFIX=	yes
+ALL_TARGET=	freebsd
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xworm ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/xworm
+	${INSTALL_PROGRAM} ${WRKSRC}/xworm ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/xworm
 .for file in font grid raw
-	@ ${INSTALL_DATA} ${WRKSRC}/xworm.${file} ${PREFIX}/share/xworm
+	${INSTALL_DATA} ${WRKSRC}/xworm.${file} ${PREFIX}/share/xworm
 .endfor
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/xworm/patches/patch-aa games/xworm/patches/patch-aa
--- /usr/ports/games/xworm/patches/patch-aa	Mon Sep 28 11:32:25 1998
+++ games/xworm/patches/patch-aa	Wed Aug 30 20:25:33 2000
@@ -1,18 +1,26 @@
---- Makefile.orig	Wed May  7 11:28:12 1997
-+++ Makefile	Sun Sep 27 12:19:42 1998
-@@ -6,21 +6,26 @@
+--- Makefile.orig	Thu May  8 01:28:12 1997
++++ Makefile	Sat Aug 12 03:01:04 2000
+@@ -1,26 +1,31 @@
+ # Makefile for XWorm.
+ 
+ #CC = cc
+-CC = gcc
++CC ?= gcc
+ 
  HPFLAGS = -O -D_HPUX_SOURCE
  SUNFLAGS = -O
  LINUXFLAGS = -O
-+FREEBSDFLAGS= -O -DPREFIX=\"/usr/X11R6/share/xworm\"
++FREEBSDFLAGS= ${CFLAGS} -DXWORMDIR=\"${PREFIX}/share/xworm\"
  
- INCDIR = -I/usr/include/X11R5 -I/usr/include -I/usr/X11R6/include
+-INCDIR = -I/usr/include/X11R5 -I/usr/include -I/usr/X11R6/include
++INCDIR = -I${X11BASE}/include
  
  HPLINK = -L/usr/local/lib/X11R5 -lXt -lX11 -lm
  SUNLINK = -L/usr/local/lib/X11R5 -lXt -lX11 -lm -lsocket -lnsl -lICE -lSM
- LINUXLINK = -L/usr/X11R6/lib -lXt -lX11 -lm
+-LINUXLINK = -L/usr/X11R6/lib -lXt -lX11 -lm
++LINUXLINK = -L${X11BASE}/lib -lXt -lX11 -lm
 +.if ${PORTOBJFORMAT} == "elf"
-+LINUXLINK+= -Wl,-rpath,$(X11BASE)/lib
++LINUXLINK+= -Wl,-rpath,${X11BASE}/lib
 +.endif
  
  all: 
diff -urN /usr/ports/games/xworm/patches/patch-ab games/xworm/patches/patch-ab
--- /usr/ports/games/xworm/patches/patch-ab	Sun Jul  5 04:31:54 1998
+++ games/xworm/patches/patch-ab	Sat Aug 12 03:00:12 2000
@@ -18,9 +18,9 @@
 +#define PREFIX "."
 +#endif
 +
-+#define gridfile PREFIX "/xworm.grid"
-+#define fontfile PREFIX "/xworm.font"
-+#define logofile PREFIX "/xworm.raw"
++#define gridfile XWORMDIR "/xworm.grid"
++#define fontfile XWORMDIR "/xworm.font"
++#define logofile XWORMDIR "/xworm.raw"
  
  #define maxQ 5000    /* max queue */
  #define NCOLORS 15   /* number of colours */


>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?20000904191215.6721237B422>