Date: Sun, 30 Oct 2005 08:13:40 +0800 (CST)
From: Li-Lun Wang (Leland Wang) <llwang@infor.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: ports/88206: Replace /usr/X11R6 with ${X11BASE} in games/noegnud-* by maintainer
Message-ID: <20051030001340.79B4645C3B@infor.ck.tp.edu.tw>
Resent-Message-ID: <200510300020.j9U0KHKa026774@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88206
>Category: ports
>Synopsis: Replace /usr/X11R6 with ${X11BASE} in games/noegnud-* by maintainer
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 30 00:20:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Li-Lun Wang (Leland Wang)
>Release: FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD Athena.infor.org 4.9-RELEASE-p1 FreeBSD 4.9-RELEASE-p1 #1: Wed Dec 3 02:14:02 CST 2003 root@Athena.infor.org:/home/adm/obj/usr/src/sys/Athena i386
>Description:
Replace the occurrences of /usr/X11R6 with ${X11BASE} in games/noegnud-nethack,
games/noegnud-slashem, games/noegnud-littlehack, and games/noegnud-nethack-deet
as pointed out by kris@.
Not bumping PORTREVISION as this does not affact any successfully built
packages. Compilation fails for people suffering from this problem.
>How-To-Repeat:
>Fix:
diff -urN noegnud-nethack.orig/files/noegnud-nethack.patch noegnud-nethack/files/noegnud-nethack.patch
--- noegnud-nethack.orig/files/noegnud-nethack.patch Fri Feb 18 07:12:50 2005
+++ noegnud-nethack/files/noegnud-nethack.patch Sat Oct 29 18:14:08 2005
@@ -64,7 +64,7 @@
# compile normally
-COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include `sdl-config --cflags`
-+COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I/usr/X11R6/include
++COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
@@ -73,7 +73,7 @@
+CFLAGS += $(STD_CFLAGS)
-LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L/usr/X11R6/lib -lgnuregex
++LFLAGS = -L${X11BASE}/lib -lgnuregex
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
diff -urN noegnud-slashem.orig/files/noegnud-slashem.patch noegnud-slashem/files/noegnud-slashem.patch
--- noegnud-slashem.orig/files/noegnud-slashem.patch Fri Feb 18 07:12:51 2005
+++ noegnud-slashem/files/noegnud-slashem.patch Sat Oct 29 18:53:29 2005
@@ -1,6 +1,6 @@
diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src variants/slashem-0.0.6E4F8/sys/unix/Makefile.src
---- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src Sat Nov 20 21:50:19 2004
-+++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.src Sat Nov 20 21:53:09 2004
+--- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src Sat Oct 29 18:45:35 2005
++++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.src Sat Oct 29 18:51:48 2005
@@ -31,7 +31,7 @@
# For Systos users compiling on the ST, you'll either need a bourne shell
# clone or you'll need to do make depend, etc. by hand. In either case,
@@ -19,12 +19,12 @@
#
# For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
#
-@@ -118,12 +118,12 @@
+@@ -118,14 +118,14 @@
# flags for Linux
# compile normally
-COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include `sdl-config --cflags`
-+COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I/usr/X11R6/include
++COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
@@ -32,8 +32,11 @@
-CFLAGS = $(STD_CFLAGS)
+CFLAGS += $(STD_CFLAGS)
- LFLAGS = -L/usr/X11R6/lib
+-LFLAGS = -L/usr/X11R6/lib
++LFLAGS = -L${X11BASE}/lib
# OR compile backwards compatible a.out format
+ # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include
+ # LFLAGS = -b i486-linuxaout -L/usr/X11/lib
@@ -176,9 +176,9 @@
# The Qt and Be window systems are written in C++, while the rest of
# NetHack is standard C. If using Qt, uncomment the LD line here to get
@@ -59,8 +62,8 @@
NOEGNUD = ../win/noegnud/noegnud
diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.top variants/slashem-0.0.6E4F8/sys/unix/Makefile.top
---- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.top Sat Nov 20 21:50:19 2004
-+++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.top Sat Nov 20 21:53:30 2004
+--- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.top Sat Oct 29 18:45:35 2005
++++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.top Sat Oct 29 18:46:03 2005
@@ -14,7 +14,7 @@
# MAKE = make
@@ -80,8 +83,8 @@
FILE_AREA_VAR = $(VARDIR)
FILE_AREA_SAVE = $(VARDIR)/save
diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.utl variants/slashem-0.0.6E4F8/sys/unix/Makefile.utl
---- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.utl Sat Nov 20 21:50:19 2004
-+++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.utl Sat Nov 20 21:54:19 2004
+--- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.utl Sat Oct 29 18:45:35 2005
++++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.utl Sat Oct 29 18:51:52 2005
@@ -15,7 +15,7 @@
# if you are using gcc as your compiler,
@@ -91,18 +94,20 @@
#
# For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
#
-@@ -72,7 +72,7 @@
+@@ -72,8 +72,8 @@
# flags for Linux
# compile normally
-CFLAGS = -O2 -fomit-frame-pointer -I../include -I/usr/X11R6/include
-+CFLAGS += -O2 -fomit-frame-pointer -I../include -I/usr/X11R6/include
- LFLAGS = -L/usr/X11R6/lib
+-LFLAGS = -L/usr/X11R6/lib
++CFLAGS += -O2 -fomit-frame-pointer -I../include -I${X11BASE}/include
++LFLAGS = -L${X11BASE}/lib
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include
+ # LFLAGS = -b i486-linuxaout -L/usr/X11/lib
diff -urN variants/slashem-0.0.6E4F8.orig/win/tty/termcap.c variants/slashem-0.0.6E4F8/win/tty/termcap.c
---- variants/slashem-0.0.6E4F8.orig/win/tty/termcap.c Sat Nov 20 23:11:00 2004
-+++ variants/slashem-0.0.6E4F8/win/tty/termcap.c Sat Nov 20 23:11:19 2004
+--- variants/slashem-0.0.6E4F8.orig/win/tty/termcap.c Sun Mar 31 16:06:19 2002
++++ variants/slashem-0.0.6E4F8/win/tty/termcap.c Sat Oct 29 18:46:03 2005
@@ -835,7 +835,7 @@
#include <curses.h>
diff -urN noegnud-littlehack.orig/files/noegnud-littlehack.patch noegnud-littlehack/files/noegnud-littlehack.patch
--- noegnud-littlehack.orig/files/noegnud-littlehack.patch Fri Feb 18 07:12:49 2005
+++ noegnud-littlehack/files/noegnud-littlehack.patch Sat Oct 29 19:00:25 2005
@@ -64,7 +64,7 @@
# compile normally
-COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include `sdl-config --cflags`
-+COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I/usr/X11R6/include
++COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
@@ -73,7 +73,7 @@
+CFLAGS += $(STD_CFLAGS)
-LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L/usr/X11R6/lib -lgnuregex
++LFLAGS = -L${X11BASE}/lib -lgnuregex
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
diff -urN noegnud-nethack-deet.orig/files/noegnud-nethack-deet.patch noegnud-nethack-deet/files/noegnud-nethack-deet.patch
--- noegnud-nethack-deet.orig/files/noegnud-nethack-deet.patch Fri Feb 18 07:12:50 2005
+++ noegnud-nethack-deet/files/noegnud-nethack-deet.patch Sat Oct 29 19:04:02 2005
@@ -73,7 +73,7 @@
# compile normally
-COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include `sdl-config --cflags`
-+COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I/usr/X11R6/include
++COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
@@ -82,7 +82,7 @@
+CFLAGS += $(STD_CFLAGS)
-LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L/usr/X11R6/lib -lgnuregex
++LFLAGS = -L${X11BASE}/lib -lgnuregex
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051030001340.79B4645C3B>