From b7dd22c506adb12e80dd19da759424f34c0094a5 Mon Sep 17 00:00:00 2001
From: wilfried <wilfried@openbsd.org>
Date: Thu, 17 Apr 2003 10:45:23 +0000
Subject: [PATCH] Fix from maintainer; moved files from
 ${LOCALBASE}/share/ddd-3.3.1 to ${LOCALBASE}/share/ddd

---
 devel/ddd/patches/patch-Makefile_in        | 12 ++++
 devel/ddd/patches/patch-ddd_Makefile_in    | 17 +++++-
 devel/ddd/patches/patch-themes_Makefile_in | 12 ++++
 devel/ddd/patches/patch-vsllib_Makefile_in | 12 ++++
 devel/ddd/pkg/PLIST                        | 68 +++++++++++-----------
 5 files changed, 84 insertions(+), 37 deletions(-)
 create mode 100644 devel/ddd/patches/patch-Makefile_in
 create mode 100644 devel/ddd/patches/patch-themes_Makefile_in
 create mode 100644 devel/ddd/patches/patch-vsllib_Makefile_in

diff --git a/devel/ddd/patches/patch-Makefile_in b/devel/ddd/patches/patch-Makefile_in
new file mode 100644
index 00000000000..ca371925d2f
--- /dev/null
+++ b/devel/ddd/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2003/04/17 10:45:23 wilfried Exp $
+--- Makefile.in.orig	Mon Apr 30 18:39:08 2001
++++ Makefile.in	Mon Apr  7 23:59:29 2003
+@@ -95,7 +95,7 @@ target_alias = @target_alias@
+ target_triplet = @target@
+ LIBTERMCAP = @LIBTERMCAP@
+ 
+-dddrootdir = $(pkgdatadir)-$(VERSION)
++dddrootdir = $(pkgdatadir)
+ 
+ # -----------------------------------------------------------------------------
+ # Data.
diff --git a/devel/ddd/patches/patch-ddd_Makefile_in b/devel/ddd/patches/patch-ddd_Makefile_in
index be925d261d7..2471a86ccd5 100644
--- a/devel/ddd/patches/patch-ddd_Makefile_in
+++ b/devel/ddd/patches/patch-ddd_Makefile_in
@@ -1,7 +1,18 @@
-$OpenBSD: patch-ddd_Makefile_in,v 1.2 2002/03/21 05:28:21 fgsch Exp $
+$OpenBSD: patch-ddd_Makefile_in,v 1.3 2003/04/17 10:45:23 wilfried Exp $
 --- ddd/Makefile.in.orig	Fri Feb  2 12:47:11 2001
-+++ ddd/Makefile.in	Wed Mar 13 04:36:12 2002
-@@ -2608,17 +2608,8 @@ configinfo.C: USERINFO $(srcdir)/config-
++++ ddd/Makefile.in	Tue Apr  8 07:55:23 2003
+@@ -186,8 +186,8 @@ SUFFIXES = .C .c .Y .L .txt .xbm .xbmxx 
+ 
+ 
+ # Shared data installation
+-dddrootdir = $(pkgdatadir)-$(VERSION)
+-dddappdir = $(pkgdatadir)-$(VERSION)/$(ddd)
++dddrootdir = $(pkgdatadir)
++dddappdir = $(pkgdatadir)/$(ddd)
+ 
+ # -----------------------------------------------------------------------------
+ # DDD Sources.
+@@ -2616,17 +2616,8 @@ configinfo.C: USERINFO $(srcdir)/config-
  	$(MV) $@~ $@
  
  # If `~/.ddd_userinfo' exists, use this file as personal identification.
diff --git a/devel/ddd/patches/patch-themes_Makefile_in b/devel/ddd/patches/patch-themes_Makefile_in
new file mode 100644
index 00000000000..ce0e6f9d5f6
--- /dev/null
+++ b/devel/ddd/patches/patch-themes_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-themes_Makefile_in,v 1.1 2003/04/17 10:45:23 wilfried Exp $
+--- themes/Makefile.in.orig	Mon Apr 30 18:39:13 2001
++++ themes/Makefile.in	Tue Apr  8 08:01:12 2003
+@@ -88,7 +88,7 @@ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ 
+-dddrootdir = $(pkgdatadir)-@VERSION@
++dddrootdir = $(pkgdatadir)
+ 
+ # -----------------------------------------------------------------------------
+ # DDD themes.
diff --git a/devel/ddd/patches/patch-vsllib_Makefile_in b/devel/ddd/patches/patch-vsllib_Makefile_in
new file mode 100644
index 00000000000..b9c4c87e672
--- /dev/null
+++ b/devel/ddd/patches/patch-vsllib_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-vsllib_Makefile_in,v 1.1 2003/04/17 10:45:23 wilfried Exp $
+--- vsllib/Makefile.in.orig	Mon Apr 30 18:39:12 2001
++++ vsllib/Makefile.in	Tue Apr  8 07:56:59 2003
+@@ -88,7 +88,7 @@ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ 
+-dddrootdir = $(pkgdatadir)-@VERSION@
++dddrootdir = $(pkgdatadir)
+ 
+ # -----------------------------------------------------------------------------
+ # VSL files.
diff --git a/devel/ddd/pkg/PLIST b/devel/ddd/pkg/PLIST
index 014e04e3c9e..88a2f3481b7 100644
--- a/devel/ddd/pkg/PLIST
+++ b/devel/ddd/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2003/04/10 16:51:21 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.8 2003/04/17 10:45:23 wilfried Exp $
 @unexec install-info --delete --info-dir=%D/info %D/info/ddd-themes.info
 @unexec install-info --delete --info-dir=%D/info %D/info/ddd.info
 bin/ddd
@@ -19,35 +19,35 @@ info/ddd.info-7
 info/ddd.info-8
 info/ddd.info-9
 man/man1/ddd.1
-share/${DISTNAME}/COPYING
-share/${DISTNAME}/NEWS
-share/${DISTNAME}/ddd/Ddd
-share/${DISTNAME}/themes/green.vsl
-share/${DISTNAME}/themes/red.vsl
-share/${DISTNAME}/themes/smalltitles.vsl
-share/${DISTNAME}/themes/smallvalues.vsl
-share/${DISTNAME}/themes/suppress.vsl
-share/${DISTNAME}/themes/tinyvalues.vsl
-share/${DISTNAME}/vsllib/arcs.vsl
-share/${DISTNAME}/vsllib/builtin.vsl
-share/${DISTNAME}/vsllib/colors.vsl
-share/${DISTNAME}/vsllib/ctree.vsl
-share/${DISTNAME}/vsllib/ddd.vsl
-share/${DISTNAME}/vsllib/flow.vsl
-share/${DISTNAME}/vsllib/flowplus.vsl
-share/${DISTNAME}/vsllib/fonts.vsl
-share/${DISTNAME}/vsllib/linebreak.vsl
-share/${DISTNAME}/vsllib/list.vsl
-share/${DISTNAME}/vsllib/slopes.vsl
-share/${DISTNAME}/vsllib/std.vsl
-share/${DISTNAME}/vsllib/struct.vsl
-share/${DISTNAME}/vsllib/symbols.vsl
-share/${DISTNAME}/vsllib/tab.vsl
-share/${DISTNAME}/vsllib/tree.vsl
-share/${DISTNAME}/vsllib/verbose.vsl
-share/${DISTNAME}/vsllib/vsl.vsl
-share/${DISTNAME}/vsllib/vsldef.vsl
-share/${DISTNAME}/vsllib/vsllib.vsl
+share/ddd/COPYING
+share/ddd/NEWS
+share/ddd/ddd/Ddd
+share/ddd/themes/green.vsl
+share/ddd/themes/red.vsl
+share/ddd/themes/smalltitles.vsl
+share/ddd/themes/smallvalues.vsl
+share/ddd/themes/suppress.vsl
+share/ddd/themes/tinyvalues.vsl
+share/ddd/vsllib/arcs.vsl
+share/ddd/vsllib/builtin.vsl
+share/ddd/vsllib/colors.vsl
+share/ddd/vsllib/ctree.vsl
+share/ddd/vsllib/ddd.vsl
+share/ddd/vsllib/flow.vsl
+share/ddd/vsllib/flowplus.vsl
+share/ddd/vsllib/fonts.vsl
+share/ddd/vsllib/linebreak.vsl
+share/ddd/vsllib/list.vsl
+share/ddd/vsllib/slopes.vsl
+share/ddd/vsllib/std.vsl
+share/ddd/vsllib/struct.vsl
+share/ddd/vsllib/symbols.vsl
+share/ddd/vsllib/tab.vsl
+share/ddd/vsllib/tree.vsl
+share/ddd/vsllib/verbose.vsl
+share/ddd/vsllib/vsl.vsl
+share/ddd/vsllib/vsldef.vsl
+share/ddd/vsllib/vsllib.vsl
 share/doc/ddd/PROBLEMS
 share/doc/ddd/README
 share/doc/ddd/ddd-paper.ps.gz
@@ -55,9 +55,9 @@ share/doc/ddd/ddd.ps.gz
 share/doc/ddd/sample.c
 share/doc/ddd/sample.dddinit
 @dirrm share/doc/ddd
-@dirrm share/${DISTNAME}/vsllib
-@dirrm share/${DISTNAME}/themes
-@dirrm share/${DISTNAME}/ddd
-@dirrm share/${DISTNAME}
+@dirrm share/ddd/vsllib
+@dirrm share/ddd/themes
+@dirrm share/ddd/ddd
+@dirrm share/ddd
 @exec install-info --info-dir=%D/info %D/info/ddd-themes.info
 @exec install-info --info-dir=%D/info %D/info/ddd.info