FreeBSD Bugzilla – Attachment 9428 Details for
Bug 19307
make x11/qrash more prefix-correct
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 2.76 KB, created by
Trevor Johnson
on 2000-06-15 19:10:03 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Trevor Johnson
Created:
2000-06-15 19:10:03 UTC
Size:
2.76 KB
patch
obsolete
>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 );
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 19307
: 9428