| 1 |
matsuu 09/01/01 01:33:50 |
| 2 |
|
| 3 |
Added: xmbdfed-4.7_p1-gentoo.patch |
| 4 |
Log: |
| 5 |
Added ~amd64. Fixed dependency. Added RESTRICT="test" |
| 6 |
(Portage version: 2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-misc/xmbdfed/files/xmbdfed-4.7_p1-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xmbdfed/files/xmbdfed-4.7_p1-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xmbdfed/files/xmbdfed-4.7_p1-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: xmbdfed-4.7_p1-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naur xmbdfed-4.7.orig/Makefile xmbdfed-4.7/Makefile |
| 17 |
--- xmbdfed-4.7.orig/Makefile 2004-02-18 00:24:06.000000000 +0900 |
| 18 |
+++ xmbdfed-4.7/Makefile 2009-01-01 09:38:56.000000000 +0900 |
| 19 |
@@ -23,7 +23,7 @@ |
| 20 |
# $Id: xmbdfed-4.7_p1-gentoo.patch,v 1.1 2009/01/01 01:33:50 matsuu Exp $ |
| 21 |
# |
| 22 |
CC = gcc |
| 23 |
-CFLAGS = -g -Wall |
| 24 |
+CFLAGS += -g -Wall |
| 25 |
|
| 26 |
OTHER = README CHANGES COPYRIGHTS Makefile Imakefile.lesstif Project.tmpl \ |
| 27 |
xmbdfedrc xmbdfed.man |
| 28 |
@@ -46,9 +46,9 @@ |
| 29 |
# Uncomment these if you have the FreeType library and want to use it to |
| 30 |
# import OpenType fonts. |
| 31 |
# |
| 32 |
-#FTYPE_INCS = -I/usr/local/include |
| 33 |
-#FTYPE_LIBS = -L/usr/local/lib -lfreetype |
| 34 |
-#FTYPE_DEFS = -DHAVE_FREETYPE |
| 35 |
+FTYPE_INCS = `freetype-config --cflags` |
| 36 |
+FTYPE_LIBS = `freetype-config --libs` |
| 37 |
+FTYPE_DEFS = -DHAVE_FREETYPE |
| 38 |
|
| 39 |
# |
| 40 |
# Uncomment these if you have the hbf.h and hbf.c files in the current |
| 41 |
@@ -64,7 +64,7 @@ |
| 42 |
# files with a ".gz" extension. If you don't care about HBF fonts, just |
| 43 |
# comment this line out. |
| 44 |
# |
| 45 |
-HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/local/bin/gunzip -c\"" |
| 46 |
+HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/bin/gunzip -c\"" |
| 47 |
|
| 48 |
# |
| 49 |
# Set the defines used for all files except the HBF support. |
| 50 |
@@ -82,15 +82,15 @@ |
| 51 |
# |
| 52 |
# Uncomment these for Solaris. |
| 53 |
# |
| 54 |
-INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS) |
| 55 |
-LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \ |
| 56 |
- -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS) |
| 57 |
+#INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS) |
| 58 |
+#LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \ |
| 59 |
+# -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS) |
| 60 |
|
| 61 |
# |
| 62 |
# Uncomment these for Linux. |
| 63 |
# |
| 64 |
-#INCS = -I/usr/X11/include $(FTYPE_INCS) |
| 65 |
-#LIBS = -L/usr/X11/lib -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS) |
| 66 |
+INCS = -I/usr/include $(FTYPE_INCS) |
| 67 |
+LIBS = -L/usr/lib -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS) |
| 68 |
|
| 69 |
# |
| 70 |
# Uncomment these for HPUX. |
| 71 |
@@ -132,7 +132,7 @@ |
| 72 |
all: xmbdfed |
| 73 |
|
| 74 |
xmbdfed: $(OBJS) |
| 75 |
- $(PURIFY) $(CC) $(STATIC) $(CFLAGS) -o xmbdfed $(OBJS) $(LIBS) |
| 76 |
+ $(PURIFY) $(CC) $(STATIC) $(CFLAGS) $(LDFLAGS) -o xmbdfed $(OBJS) $(LIBS) |
| 77 |
|
| 78 |
hbf.o: hbf.c |
| 79 |
$(CC) $(CFLAGS) $(DEFS) $(HBFDEFS) $(INCS) -c $< -o $@ |
Archives