diff options
| author | asami <asami@FreeBSD.org> | 1997-06-19 13:26:20 +0800 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1997-06-19 13:26:20 +0800 |
| commit | 8ac6ab6c5320494c1e0352001ba06e31438e675c (patch) | |
| tree | ba8a99051ffd7502855e46c2dc80ef133d07a7d3 | |
| parent | 7fb2542f5c97b8fee01cf4a765bb6586bff9fed6 (diff) | |
| download | freebsd-ports-gnome-8ac6ab6c5320494c1e0352001ba06e31438e675c.tar.gz freebsd-ports-gnome-8ac6ab6c5320494c1e0352001ba06e31438e675c.tar.zst freebsd-ports-gnome-8ac6ab6c5320494c1e0352001ba06e31438e675c.zip | |
Fix XPMINCLUDE, as XFree86-3.3's INCDIR doesn't include the trailing
"X11" anymore. By the way, if you see how this patch changed, you'll
know why I hate context diffs -- it would have been much easier to fix
the patch (I could have just hand-edited one line) if it were a
unified diff....
| -rw-r--r-- | games/xpat2/files/patch-aa | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/games/xpat2/files/patch-aa b/games/xpat2/files/patch-aa index 6e2eef504ba4..2c0e346e9d0a 100644 --- a/games/xpat2/files/patch-aa +++ b/games/xpat2/files/patch-aa @@ -49,16 +49,24 @@ # paths for installation in user's home-directory. *************** -*** 55,60 **** ---- 55,62 ---- +*** 53,59 **** + + # xpat2 needs to know where the xpm library resides (if needed) XPMLIB = -L$(USRLIBDIR) -lXpm - XPMINCLUDE = -I $(INCDIR) +! XPMINCLUDE = -I $(INCDIR) -+ CFLAGS += -DNO_CUSERID -+ # ***************************************************************************** # I hope you don't need to change anything below this point +--- 53,61 ---- + + # xpat2 needs to know where the xpm library resides (if needed) + XPMLIB = -L$(USRLIBDIR) -lXpm +! XPMINCLUDE = -I$(INCDIR)/X11 +! +! CFLAGS += -DNO_CUSERID + # ***************************************************************************** + # I hope you don't need to change anything below this point *************** *** 181,188 **** chmod 755 $(XPATLIBDIR)/$$f; \ |