summaryrefslogtreecommitdiff
path: root/x11/xview-config/patches/patch-ac
diff options
context:
space:
mode:
Diffstat (limited to 'x11/xview-config/patches/patch-ac')
-rw-r--r--x11/xview-config/patches/patch-ac38
1 files changed, 31 insertions, 7 deletions
diff --git a/x11/xview-config/patches/patch-ac b/x11/xview-config/patches/patch-ac
index d1763ba85a5..7d0b5e3aa41 100644
--- a/x11/xview-config/patches/patch-ac
+++ b/x11/xview-config/patches/patch-ac
@@ -1,29 +1,40 @@
-$NetBSD: patch-ac,v 1.5 2001/05/02 21:46:08 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.6 2009/12/10 20:34:44 abs Exp $
---- ./XView.obj.orig Tue Jun 29 01:13:20 1993
-+++ ./XView.obj Tue May 1 22:40:31 2001
-@@ -16,5 +16,5 @@
+--- XView.obj.orig 1993-06-29 05:13:20.000000000 +0000
++++ XView.obj
+@@ -15,7 +15,7 @@
+ STD_DEFINES = StandardDefines LibXViewDefines
#endif
HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
-INCLUDES= -I$(BUILDINCDIR)$(INCDIR)
+INCLUDES= -I$(BUILDINCDIR)/$(INCDIR)
OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
#if !NotLibXView
-@@ -86,5 +86,5 @@
+ ALLFILES = $(SRCS) $(HEADERS)
+@@ -85,17 +85,17 @@ NormalLintTarget($(SRCS))
+
#if SubdirHasPublicHeaders
# if NotLibXView
-BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),/**/)
+BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.)
install::
-@@ -93,5 +93,5 @@
+- $(MKDIRHIER) $(PUB_HEADER_DEST)
++ $(MKDIRHIER) $(DESTDIR)$(PUB_HEADER_DEST)
+
InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
# else
-BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),/**/)
+BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.)
install::
-@@ -104,7 +104,7 @@
+- $(MKDIRHIER) $(XVPUB_HEADER_DEST)
++ $(MKDIRHIER) $(DESTDIR)$(XVPUB_HEADER_DEST)
+
+ InstallMultiple($(HDRSPUBLIC),$(XVPUB_HEADER_DEST))
+ # endif
+@@ -103,19 +103,19 @@ InstallMultiple($(HDRSPUBLIC),$(XVPUB_HE
+
#if SubdirHasPrivateHeaders
# if NotLibXView
-BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),/**/)
@@ -33,3 +44,16 @@ $NetBSD: patch-ac,v 1.5 2001/05/02 21:46:08 dmcmahill Exp $
+BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),.)
# endif
# if InstallPrivateHeaders
+ # if NotLibXView
+ install::
+- $(MKDIRHIER) $(PRI_HEADER_DEST)
++ $(MKDIRHIER) $(DESTDIR)$(PRI_HEADER_DEST)
+
+ InstallMultiple($(HDRSPRIVATE),$(PRI_HEADER_DEST))
+ # else
+ install::
+- $(MKDIRHIER) $(XVPRI_HEADER_DEST)
++ $(MKDIRHIER) $(DESTDIR)$(XVPRI_HEADER_DEST)
+
+ InstallMultiple($(HDRSPRIVATE),$(XVPRI_HEADER_DEST))
+ # endif