kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Fix patch reject after xorg cleanup

Browse source 
Submitted by:	pointyhat via pav
This commit is contained in:
Martin Wilke 2008-04-25 23:15:13 +00:00
parent 8e87d68e0f
commit 8776c921c7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=211992
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
java/jdk14/files/patch-plugin::common::config.gmk
View file

@ -1,21 +1,21 @@
$FreeBSD$ --- ../../deploy/make/plugin/common/config.gmk.orig 2008-04-26 01:00:47.000000000 +0200
+++ ../../deploy/make/plugin/common/config.gmk 2008-04-26 01:11:03.000000000 +0200
--- ../../deploy/make/plugin/common/config.gmk.orig Wed Nov 12 16:53:30 2003 @@ -52,16 +52,15 @@
+++ ../../deploy/make/plugin/common/config.gmk Wed Nov 12 16:53:43 2003
@@ -52,7 +52,6 @@
ifeq ($(PLATFORM), bsd) ifeq ($(PLATFORM), bsd)
PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/src/solaris PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/src/solaris
- LOCALBASE = /usr/X11R6 - X11BASE = /usr/X11R6
OTHER_LDFLAGS = -L$(LOCALBASE)/lib OTHER_LDFLAGS = -L$(X11BASE)/lib
ifeq (,$(filter-out DragonFly NetBSD,$(TRUE_PLATFORM))) ifeq (,$(filter-out DragonFly NetBSD,$(TRUE_PLATFORM)))
OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib - OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib
@@ -61,7 +60,7 @@ + OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib
endif
DEF_SVR4 =
# include search paths # include search paths
# XXXBSD: these should be defined in other place # XXXBSD: these should be defined in other place
- CPPFLAGS1 += -I$(LOCALBASE)/include -I/usr/local/include - CPPFLAGS1 += -I$(X11BASE)/include -I/usr/local/include
+ CPPFLAGS1 += -I$(LOCALBASE)/include -I${LOCALBASE}/include + CPPFLAGS1 += -I${LOCALBASE}/include
ifeq ($(TRUE_PLATFORM), FreeBSD) ifeq ($(TRUE_PLATFORM), FreeBSD)
LDFLAGS_COMMON += -pthread LDFLAGS_COMMON += -pthread