Install machine-independent scripts into /usr/local/share, etc.

Submitted by:	Thomas Gellekum <thomas@ghpc8.ihf.rwth-aachen.de>

4 files changed, 28 insertions, 17 deletions

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index df6c9183f5aa..e34920accb02 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -3,7 +3,7 @@
 # Date created:         05 April 1995
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id$
+# $Id: Makefile,v 1.2 1995/04/15 05:44:38 asami Exp $
 #
 
 DISTNAME=       icon-9.0
@@ -15,4 +15,12 @@ PATCH_STRIP=	-p1
 NO_WRKSUBDIR=	true
 ALL_TARGET=	Icon
 
+# work around a bug in rtt's preprocessor
+#
+do-build:
+	@(ENABLE_STARTUP_LOCALE=; \
+	  unset ENABLE_STARTUP_LOCALE; \
+	  cd ${WRKSRC}; \
+	  ${MAKE} PREFIX=${PREFIX} X11BASE=${X11BASE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
+
 .include <bsd.port.mk>
diff --git a/lang/icon/files/patch-ca b/lang/icon/files/patch-ca
index 7e3d405a5145..07960957c74b 100644
--- a/lang/icon/files/patch-ca
+++ b/lang/icon/files/patch-ca
@@ -25,17 +25,17 @@
   ##################################################################
 + 
 + install:
-+ 	@bin/patchstr bin/iconc ${PREFIX}/lib/icon/
++ 	@bin/patchstr bin/iconc ${PREFIX}/share/icon/
 + 	@bin/patchstr bin/icont ${PREFIX}/bin/iconx
 + 	install -c -s -g bin -o bin -m 755 bin/iconc ${PREFIX}/bin/iconc
 + 	install -c -s -g bin -o bin -m 755 bin/icont ${PREFIX}/bin/icont
 + 	install -c -s -g bin -o bin -m 755 bin/iconx ${PREFIX}/bin/iconx
-+ 	install -c -s -g bin -o bin -m 755 bin/rtt ${PREFIX}/bin/rtt
-+ 	@mkdir -p ${PREFIX}/lib/icon
-+ 	install -c -g bin -o bin -m 644 bin/dlrgint.o ${PREFIX}/lib/icon/dlrgint.o
-+ 	install -c -g bin -o bin -m 644 bin/rt.a ${PREFIX}/lib/icon/rt.a
-+ 	install -c -g bin -o bin -m 644 bin/rt.db ${PREFIX}/lib/icon/rt.db
-+ 	install -c -g bin -o bin -m 644 bin/rt.h ${PREFIX}/lib/icon/rt.h
++ 	install -c -s -g bin -o bin -m 755 bin/patchstr ${PREFIX}/bin/patchstr
++ 	@mkdir -p ${PREFIX}/share/icon
++ 	install -c -g bin -o bin -m 644 bin/dlrgint.o ${PREFIX}/share/icon/dlrgint.o
++ 	install -c -g bin -o bin -m 644 bin/rt.a ${PREFIX}/share/icon/rt.a
++ 	install -c -g bin -o bin -m 644 bin/rt.db ${PREFIX}/share/icon/rt.db
++ 	install -c -g bin -o bin -m 644 bin/rt.h ${PREFIX}/share/icon/rt.h
 + 	@mkdir -p ${PREFIX}/man/man1
 + 	install -c -g bin -o bin -m 444 docs/icon.1 ${PREFIX}/man/man1/icon.1
 + 	@gzip -9fn ${PREFIX}/man/man1/icon.1
diff --git a/lang/icon/pkg-descr b/lang/icon/pkg-descr
index a1b85af815ad..d51e17b65aa5 100644
--- a/lang/icon/pkg-descr
+++ b/lang/icon/pkg-descr
@@ -18,3 +18,10 @@ in numerical computations without explicit conversion.  Icon has
 an expression-based syntax with reserved words; in appearance,
 Icon programs resemble those of Pascal and C.
 
+The language is described in R. E. Griswold and M. T. Griswold, The
+Icon Programming Language, Prentice-Hall, Inc., Englewood Cliffs,
+NJ, second edition, 1990.
+
+For further documentation see the docs directory in the
+unpacked source tree (make extract; cd work/docs).
+
diff --git a/lang/icon/pkg-plist b/lang/icon/pkg-plist
index d3ed0d81d19c..8f40f1698586 100644
--- a/lang/icon/pkg-plist
+++ b/lang/icon/pkg-plist
@@ -1,13 +1,9 @@
-@cwd /usr/local
-@mode 755
 bin/iconc
 bin/icont
 bin/iconx
-bin/rtt
-@mode 644
-lib/icon/dlrgint.o
-lib/icon/rt.a
-lib/icon/rt.db
-lib/icon/rt.h
-@mode 444
+bin/patchstr
+share/icon/dlrgint.o
+share/icon/rt.a
+share/icon/rt.db
+share/icon/rt.h
 man/man1/icon.1.gz