aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>2000-09-22 07:29:58 +0000
committerSatoshi Asami <asami@FreeBSD.org>2000-09-22 07:29:58 +0000
commitbe643f0aafcd7f1ea7e49b0f71885a2d99d7eeb4 (patch)
treed676b5a5836c4fc2ef4efbe02823ec2e289001ab
parentba52f7c8567190f9fc5655bd973a06f26cc22ec7 (diff)
downloadports-be643f0aafcd7f1ea7e49b0f71885a2d99d7eeb4.tar.gz
ports-be643f0aafcd7f1ea7e49b0f71885a2d99d7eeb4.zip
Don't install imake config files which will overwrite XFree86 versions
and will thus screw up XFree86 when you pkg_delete this port. Submitted by: reg
Notes
Notes: svn path=/head/; revision=32980
-rw-r--r--x11-servers/XttXF86srv-common/files/patch-z0314
-rw-r--r--x11-servers/XttXF86srv-common/pkg-plist7
2 files changed, 15 insertions, 6 deletions
diff --git a/x11-servers/XttXF86srv-common/files/patch-z03 b/x11-servers/XttXF86srv-common/files/patch-z03
new file mode 100644
index 000000000000..373a4199faaf
--- /dev/null
+++ b/x11-servers/XttXF86srv-common/files/patch-z03
@@ -0,0 +1,14 @@
+--- lib/font/X-TrueType/Imakefile.orig Thu Sep 14 01:55:53 2000
++++ lib/font/X-TrueType/Imakefile Thu Sep 14 01:56:07 2000
+@@ -54,10 +54,7 @@
+ XTT_CONFIG_SRCDIR = $(TOP)/config/cf
+ XTT_CONFIG_FILES = \
+ $(XTT_CONFIG_SRCDIR)/xtt.tmpl $(XTT_CONFIG_SRCDIR)/xttMod.tmpl \
+- $(XTT_CONFIG_SRCDIR)/xttsite.def $(XTT_CONFIG_SRCDIR)/Imake.rules \
+- $(XTT_CONFIG_SRCDIR)/Imake.tmpl $(XTT_CONFIG_SRCDIR)/X11.tmpl \
+- $(XTT_CONFIG_SRCDIR)/bsdLib.rules $(XTT_CONFIG_SRCDIR)/ibmLib.rules \
+- $(XTT_CONFIG_SRCDIR)/linux.cf
++ $(XTT_CONFIG_SRCDIR)/xttsite.def
+ # if XTrueTypeInstallConfigFiles
+ InstallMultipleDestFlags(install,$(XTT_CONFIG_FILES),$(CONFIGDIR),$(INSTDATFLAGS))
+ # endif
diff --git a/x11-servers/XttXF86srv-common/pkg-plist b/x11-servers/XttXF86srv-common/pkg-plist
index 9dfa4097c87a..3537bd5811d1 100644
--- a/x11-servers/XttXF86srv-common/pkg-plist
+++ b/x11-servers/XttXF86srv-common/pkg-plist
@@ -3,12 +3,6 @@ include/X11/fonts/codeconv/xttcap.h
include/X11/fonts/codeconv/xttcconv.h
include/X11/fonts/codeconv/xttcconvP.h
include/X11/fonts/codeconv/xttcommon.h
-lib/X11/config/Imake.rules
-lib/X11/config/Imake.tmpl
-lib/X11/config/X11.tmpl
-lib/X11/config/bsdLib.rules
-lib/X11/config/ibmLib.rules
-lib/X11/config/linux.cf
lib/X11/config/xtt.tmpl
lib/X11/config/xttMod.tmpl
lib/X11/config/xttsite.def
@@ -54,5 +48,6 @@ share/doc/Xtt/INSTALL.eng
share/doc/Xtt/INSTALL.jis
share/doc/Xtt/MISCNOTES.eng
share/doc/Xtt/MISCNOTES.jis
+@dirrm lib/modules/codeconv
@dirrm share/doc/Xtt
@dirrm include/X11/fonts/codeconv