Date: Thu, 15 Jun 2000 14:06:31 -0400 (EDT) From: Trevor Johnson <trevor@jpj.net> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/19307: make x11/qrash more prefix-correct Message-ID: <Pine.BSI.4.05L.10006151359540.28563-100000@blues.jpj.net>
next in thread | raw e-mail | index | archive | help
>Number: 19307
>Category: ports
>Synopsis: make x11/qrash more prefix-correct
>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: Thu Jun 15 11:10:03 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Trevor Johnson
>Release: 4.0-CURRENT i386
>Organization:
myself
>Environment:
FreeBSD tethys.csudh.edu 4.0-20000214-CURRENT FreeBSD 4.0-20000214-CURRENT
#0: Tue Feb 15 01:45:52 GMT 2000
root@monster.cdrom.com:/usr/src/sys/compile/GENERIC i386
and XFree86 4.0
>Description:
I'm the maintainer of the port. I hard-coded the /usr/X11R6/ path into
some of the patches. With this change, the prefix will be inserted into
the files by sed instead. I only tested it with X in the usual location.
>How-To-Repeat:
N/A
>Fix:
diff -ruN qrash.orig/Makefile qrash/Makefile
--- qrash.orig/Makefile Thu Apr 13 12:09:59 2000
+++ qrash/Makefile Thu Jun 15 10:44:06 2000
@@ -22,4 +22,13 @@
ALL_TARGET= qrash
USE_X_PREFIX= yes
+post-patch:
+ @${SED} s=PREFIX=${PREFIX}=g ${WRKSRC}/resource.cc >${WRKSRC}/resource-sed.cc
+ ${MV} ${WRKSRC}/resource-sed.cc ${WRKSRC}/resource.cc
+ @${SED} s=PREFIX=${PREFIX}=g ${WRKSRC}/Makefile.in >${WRKSRC}/Makefile-sed.in
+ ${MV} ${WRKSRC}/Makefile-sed.in ${WRKSRC}/Makefile.in
+ @${SED} s=/usr/X11=${PREFIX}=g ${WRKSRC}/configure >${WRKSRC}/configure-sed
+ ${MV} ${WRKSRC}/configure-sed ${WRKSRC}/configure
+ ${CHMOD} +x ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff -ruN qrash.orig/patches/patch-ab qrash/patches/patch-ab
--- qrash.orig/patches/patch-ab Sun Dec 26 18:24:16 1999
+++ qrash/patches/patch-ab Thu Jun 15 10:25:31 2000
@@ -1,5 +1,5 @@
--- configure.orig Wed Sep 24 11:50:18 1997
-+++ configure Sun Oct 24 05:48:05 1999
++++ configure Thu Jun 15 10:25:16 2000
@@ -9,7 +9,7 @@
echo "what CPU has your box inside?"
echo "1) i386-compatible"
@@ -9,7 +9,7 @@
case $cpu in
1) echo "CPU=_g" > options ;
echo "CXXFLAGS += -Di386" >> options ;;
-@@ -32,13 +33,13 @@
+@@ -32,7 +32,7 @@
echo "3) Vesa (dos only)"
#echo "4) Win32 DirectDraw"
#echo "5) OS/2 DIVE"
@@ -18,14 +18,7 @@
case $gfx in
1) echo "GFX=vga" >> options ;
echo "LIBS += -lvga" >> options ;;
-
- 2) echo "GFX=x11" >> options ;
-- echo "LIBS += -L/usr/X11/lib -lX11" >> options ;;
-+ echo "LIBS += -L/usr/X11R6/lib -lX11" >> options ;;
-
- 3) echo "GFX=dos" >> options ;
- echo "LIBS += -Lsvgakit -lsvga -lpmode -lztime" >> options ;;
-@@ -68,7 +70,7 @@
+@@ -68,7 +68,7 @@
echo "10) none of the above"
#echo "11) Win32"
#echo "12) OS/2"
diff -ruN qrash.orig/patches/patch-ae qrash/patches/patch-ae
--- qrash.orig/patches/patch-ae Sun Dec 26 18:24:18 1999
+++ qrash/patches/patch-ae Thu Jun 15 10:42:48 2000
@@ -1,9 +1,9 @@
--- Makefile.in.orig Wed Sep 24 09:49:16 1997
-+++ Makefile.in Sun Oct 24 06:59:51 1999
++++ Makefile.in Thu Jun 15 10:42:37 2000
@@ -1,5 +1,5 @@
# Maximum optimization
-CXXFLAGS += -O6 -ffast-math -funroll-loops -w
-+CXXFLAGS += -O6 -ffast-math -funroll-loops -w -I /usr/X11R6/include/
++CXXFLAGS += -O6 -ffast-math -funroll-loops -w -I PREFIX/include/
# Debugging options
#CXXFLAGS += -g
diff -ruN qrash.orig/patches/patch-ag qrash/patches/patch-ag
--- qrash.orig/patches/patch-ag Sun Dec 26 18:24:20 1999
+++ qrash/patches/patch-ag Thu Jun 15 10:28:45 2000
@@ -5,7 +5,7 @@
void resInit( char* name )
{
- strcpy( resource_name, my_strlwr(name) );
-+ strcpy( resource_name, "/usr/X11R6/share/qrash/qrash.dat" );
++ strcpy( resource_name, "PREFIX/share/qrash/qrash.dat" );
FILE* f = fopen( resource_name, "rb" );
if(f) {
fseek( f, -4, SEEK_END );
>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?Pine.BSI.4.05L.10006151359540.28563-100000>