summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2010-09-17 01:25:59 +0000
committerJeroen Roovers <jer@gentoo.org>2010-09-17 01:25:59 +0000
commit4887cfae1c66d56798d67c2fa7440e9c41d81032 (patch)
tree6b5362133b25b1368dd923361935d90eb4aa6d92 /x11-misc/chgres/files
parentUpdate glibc dependency, see bug #335101 by Victor Orozco <tuxtor@shekalug.org> (diff)
downloadgentoo-2-4887cfae1c66d56798d67c2fa7440e9c41d81032.tar.gz
gentoo-2-4887cfae1c66d56798d67c2fa7440e9c41d81032.tar.bz2
gentoo-2-4887cfae1c66d56798d67c2fa7440e9c41d81032.zip
Respect LDFLAGS (bug #337183), CC, CFLAGS. Use pkg-config for LIBS and INCLUDES. Fix includes.
(Portage version: 2.2_rc82/cvs/Linux i686)
Diffstat (limited to 'x11-misc/chgres/files')
-rw-r--r--x11-misc/chgres/files/chgres-0.1-flags.patch21
-rw-r--r--x11-misc/chgres/files/chgres-0.1-includes.patch15
2 files changed, 36 insertions, 0 deletions
diff --git a/x11-misc/chgres/files/chgres-0.1-flags.patch b/x11-misc/chgres/files/chgres-0.1-flags.patch
new file mode 100644
index 000000000000..78ed2476f799
--- /dev/null
+++ b/x11-misc/chgres/files/chgres-0.1-flags.patch
@@ -0,0 +1,21 @@
+--- Makefile.orig 2001-04-18 23:07:56.000000000 +0200
++++ Makefile 2010-09-17 03:08:55.000000000 +0200
+@@ -1,9 +1,9 @@
+-CFLAGS=
+-LDFLAGS= -L/usr/X11R6/lib -lXext -lX11 -lXxf86vm -lXxf86dga
++LIBS= $(shell pkg-config --libs xext x11 xxf86vm xxf86dga)
++INCLUDES= $(shell pkg-config --cflags xext x11 xxf86vm xxf86dga)
+ prefix=/usr
+
+ chgres: chgres.o
+- $(CC) -o $@ $< $(LDFLAGS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+
+ install: chgres
+ install -D -m 0555 chgres $(prefix)/bin/
+@@ -12,4 +12,4 @@
+ rm -f core chgres.o chgres
+
+ .c.o:
+- $(CC) $(CFLAGS) -c $< -o $@
++ $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
diff --git a/x11-misc/chgres/files/chgres-0.1-includes.patch b/x11-misc/chgres/files/chgres-0.1-includes.patch
new file mode 100644
index 000000000000..6c686c255967
--- /dev/null
+++ b/x11-misc/chgres/files/chgres-0.1-includes.patch
@@ -0,0 +1,15 @@
+--- chgres.c.orig 2001-04-18 22:40:05.000000000 +0200
++++ chgres.c 2010-09-17 03:20:37.000000000 +0200
+@@ -17,9 +17,11 @@
+ */
+
+ #include <X11/Xlib.h>
+-#include <X11/extensions/xf86dga.h>
++#include <X11/extensions/Xxf86dga.h>
+ #include <X11/extensions/xf86vmode.h>
+ #include <stdio.h>
++#include <stdlib.h> /* exit() */
++#include <strings.h> /* strcasecmp() */
+
+ #define VERSION "0.1"
+