diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-06-21 12:19:25 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-06-21 12:19:25 +0000 |
commit | 9b34d9e6ac9f142ecaf071f40d13403f65af2494 (patch) | |
tree | 46ea7b80049e95d2b4ca35af2dc6925d93d4980b /x11/qrash | |
parent | Initialize supplementary groups. (diff) |
Make it PREFIX-clean.
PR: 19307
Submitted by: Trevor Johnson <trevor@jpj.net>
Diffstat (limited to 'x11/qrash')
-rw-r--r-- | x11/qrash/Makefile | 7 | ||||
-rw-r--r-- | x11/qrash/files/patch-ab | 13 | ||||
-rw-r--r-- | x11/qrash/files/patch-ae | 34 | ||||
-rw-r--r-- | x11/qrash/files/patch-ag | 2 | ||||
-rw-r--r-- | x11/qrash/pkg-plist | 2 |
5 files changed, 35 insertions, 23 deletions
diff --git a/x11/qrash/Makefile b/x11/qrash/Makefile index f6c5683ea29e..5f964861a8bb 100644 --- a/x11/qrash/Makefile +++ b/x11/qrash/Makefile @@ -19,7 +19,12 @@ MAINTAINER= trevor@jpj.net GNU_CONFIGURE= yes USE_GMAKE= yes -ALL_TARGET= qrash USE_X_PREFIX= yes +ALL_TARGET= qrash + +post-patch: + @${PERL} -pi -e "s=PREFIX=${PREFIX}=g" ${WRKSRC}/resource.cc + @${PERL} -pi -e "s=/usr/X11=${PREFIX}=g" ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/x11/qrash/files/patch-ab b/x11/qrash/files/patch-ab index baefcf575c4f..86cc14c40614 100644 --- a/x11/qrash/files/patch-ab +++ b/x11/qrash/files/patch-ab @@ -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 --git a/x11/qrash/files/patch-ae b/x11/qrash/files/patch-ae index 93021724ff69..8fbb3aa9c4ef 100644 --- a/x11/qrash/files/patch-ae +++ b/x11/qrash/files/patch-ae @@ -1,23 +1,37 @@ ---- Makefile.in.orig Wed Sep 24 09:49:16 1997 -+++ Makefile.in Sun Oct 24 06:59:51 1999 -@@ -1,5 +1,5 @@ +--- Makefile.in.orig Wed Sep 24 19:49:16 1997 ++++ Makefile.in Wed Jun 21 15:00:43 2000 +@@ -1,10 +1,10 @@ # Maximum optimization -CXXFLAGS += -O6 -ffast-math -funroll-loops -w -+CXXFLAGS += -O6 -ffast-math -funroll-loops -w -I /usr/X11R6/include/ ++CXXFLAGS += -I$(X11BASE)/include -ffast-math -funroll-loops # Debugging options #CXXFLAGS += -g -@@ -49,6 +49,13 @@ + +-LIBS += -Lmikmod -lmikmd -Lzlib -lz -lm ++LIBS += -Lmikmod -lmikmd -lz -lm + + PORTABLE_OBJS = sys.o video.o music.o misc.o resource.o image.o \ + poly2d.o 3d.o font.o lines.o smooth.o +@@ -27,7 +27,7 @@ + + OBJS = $(PORTABLE_OBJS) $(SYSTEM_OBJS) $(CPU_OBJS) $(DEMO_OBJS) + +-TARGETS = mikmod zlib Makefile $(OBJS) ++TARGETS = mikmod Makefile $(OBJS) + + qrash : $(TARGETS) + $(CC) -o qrash $(OBJS) $(LIBS) +@@ -49,6 +49,12 @@ parts.o: $(CC) -c parts.cc + +install: -+ strip -s qrash -+ mkdir $(X11BASE)/share/qrash/ -+ install -c -m 755 -o root -g wheel qrash $(X11BASE)/bin/ -+ install -c -m 644 -o root -g wheel qrash.dat $(X11BASE)/share/qrash/ -+ install -c -m 644 -o root -g wheel README $(X11BASE)/share/qrash/ ++ mkdir -p $(PREFIX)/share/qrash/ ++ $(BSD_INSTALL_PROGRAM) qrash $(PREFIX)/bin/ ++ $(BSD_INSTALL_DATA) qrash.dat $(PREFIX)/share/qrash/ ++ $(BSD_INSTALL_MAN) README $(PREFIX)/share/qrash/ DUMMY: diff --git a/x11/qrash/files/patch-ag b/x11/qrash/files/patch-ag index a8ad14a1fa6b..695bf91772e2 100644 --- a/x11/qrash/files/patch-ag +++ b/x11/qrash/files/patch-ag @@ -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 ); diff --git a/x11/qrash/pkg-plist b/x11/qrash/pkg-plist index be2939398c30..4185a893b884 100644 --- a/x11/qrash/pkg-plist +++ b/x11/qrash/pkg-plist @@ -1,4 +1,4 @@ bin/qrash share/qrash/README share/qrash/qrash.dat -@dirrm share/qrash/ +@dirrm share/qrash |