Update for version 1.4. Make general repairs so that the port

builds and installs properly.

4 files changed, 140 insertions, 120 deletions

diff --git a/print/virtualpaper/Makefile b/print/virtualpaper/Makefile
index 1e9777d51451..f567e782fa3c 100644
--- a/print/virtualpaper/Makefile
+++ b/print/virtualpaper/Makefile
@@ -1,33 +1,58 @@
 # New ports collection makefile for:	virtualpaper
-# Version required:	1.2
+# Version required:	1.4
 # Date created:		13 June 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.6 1996/04/18 07:58:21 tg Exp $
+# $Id: Makefile,v 1.1.1.1 1996/06/14 08:00:14 jkh Exp $
 #
 
-DISTNAME=	virtualpaper-1.3
+DISTNAME=	virtualpaper-1.4
+DIST_SUBDIR=	virtualpaper-1.4
 CATEGORIES+=	print
-DISTFILES=	sources.tar.Z
 MASTER_SITES=	http://www.research.digital.com:80/SRC/virtualpaper/cgi-bin/nph-download.tcl/sources.tar.Z?object=Virtual+Paper/
-BUILD_DEPENDS=	m3build:${PORTSDIR}/lang/modula-3
-RUN_DEPENDS=	m3ship:${PORTSDIR}/lang/modula-3
+DISTFILES=	sources.tar.Z
+
+MAINTAINER=	jdp@FreeBSD.org
+
+BUILD_DEPENDS=	m3build-4:${PORTSDIR}/lang/modula-3
+LIB_DEPENDS=	m3\\.4\\.:${PORTSDIR}/lang/modula-3-lib
 
 do-build:
-	@(cd ${WRKSRC}/lecternclient ; m3build)
-	@(cd ${WRKSRC}/lecterndoc; m3build)
-	@(cd ${WRKSRC}/lectern; m3build)
-	@(cd ${WRKSRC}/ocr; m3build)
-	@(cd ${WRKSRC}/buildlectern; m3build)
-	@(cd ${WRKSRC}/editlectern; m3build)
+	@cd ${WRKSRC}/lecternclient; m3build
+	@cd ${WRKSRC}/lecterndoc; m3build
+	@cd ${WRKSRC}/lectern; m3build
+	@cd ${WRKSRC}/ocr; m3build
+	@cd ${WRKSRC}/buildlectern; m3build
+	@cd ${WRKSRC}/editlectern; m3build
 
 do-install:
-	@(cd ${WRKSRC}/lecternclient ; m3ship)
-	@(cd ${WRKSRC}/lecterndoc; m3ship)
-	@(cd ${WRKSRC}/lectern; m3ship)
-	@(cd ${WRKSRC}/ocr; m3ship)
-	@(cd ${WRKSRC}/buildlectern; m3ship)
-	@(cd ${WRKSRC}/editlectern; m3ship)
-	@/sbin/ldconfig -m ${PREFIX}/lib/m3/FreeBSD2
+	@echo "Installing files"
+	@cd ${WRKSRC}; \
+	    ${INSTALL_PROGRAM} \
+		lecternclient/FreeBSD2/LecternClient \
+		lectern/FreeBSD2/Lectern \
+		buildlectern/FreeBSD2/BuildLectern \
+		editlectern/FreeBSD2/EditLectern \
+		${PREFIX}/bin; \
+	    ${INSTALL_MAN} \
+		lecternclient/FreeBSD2/LecternClient.1 \
+		lectern/FreeBSD2/Lectern.1 \
+		buildlectern/FreeBSD2/BuildLectern.1 \
+		editlectern/FreeBSD2/EditLectern.1 \
+		${PREFIX}/man/man1; \
+	    ${INSTALL_MAN} \
+		lecternclient/FreeBSD2/LecternClient.1.html \
+		lectern/FreeBSD2/Lectern.1.html \
+		buildlectern/FreeBSD2/BuildLectern.1.html \
+		editlectern/FreeBSD2/EditLectern.1.html \
+		${PREFIX}/lib/m3/www
+	@echo "Stripping programs"
+	@cd ${PREFIX}/bin; \
+	    strip LecternClient Lectern BuildLectern EditLectern
+.if !defined(NOMANCOMPRESS)
+	@echo "Compressing manual pages"
+	@cd ${PREFIX}/man/man1; \
+	    gzip -9nf LecternClient.1 Lectern.1 BuildLectern.1 EditLectern.1
+.endif
 
 .include <bsd.port.mk>
diff --git a/print/virtualpaper/distinfo b/print/virtualpaper/distinfo
index bd001cdf5051..eac89fdf1feb 100644
--- a/print/virtualpaper/distinfo
+++ b/print/virtualpaper/distinfo
@@ -1 +1 @@
-MD5 (sources.tar.Z) = 6512f760a6bc7f58d5f82fd4a836557c
+MD5 (sources.tar.Z) = 90cf78a47732e7d242eb5f5f2cab514a
diff --git a/print/virtualpaper/files/patch-aa b/print/virtualpaper/files/patch-aa
new file mode 100644
index 000000000000..04af97e01470
--- /dev/null
+++ b/print/virtualpaper/files/patch-aa
@@ -0,0 +1,87 @@
+These patches force all the private libraries to be static, so that
+their shared libraries don't have to be installed.  That makes it
+possible to build everything without being root.
+
+Index: buildlectern/src/m3makefile
+--- buildlectern/src/m3makefile.orig	Wed May 29 14:19:51 1996
++++ buildlectern/src/m3makefile	Fri Nov  1 17:24:54 1996
+@@ -5,6 +5,9 @@
+ /*                                                             */
+ /* Makefile for BuildLectern                                   */
+ 
++override("ocr", path() & "/../..")
++override("lecterndoc", path() & "/../..")
++
+ import         ("libm3")
+ import         ("ocr")
+ import         ("lecterndoc")
+Index: editlectern/src/m3makefile
+--- editlectern/src/m3makefile.orig	Wed May 29 13:50:50 1996
++++ editlectern/src/m3makefile	Fri Nov  1 17:25:54 1996
+@@ -3,6 +3,9 @@
+ /* Last modified on Wed May 29 13:50:50 PDT 1996 by mcjones    */
+ /*      modified on Tue Mar 14 16:41:47 PST 1995 by birrell    */
+ 
++override("lecternclient", path() & "/../..")
++override("lecterndoc", path() & "/../..")
++
+ import("formsvbt")
+ import("lecternclient")
+ import("lecterndoc")
+Index: lectern/src/m3makefile
+--- lectern/src/m3makefile.orig	Mon Sep 30 12:07:34 1996
++++ lectern/src/m3makefile	Fri Nov  1 17:23:00 1996
+@@ -8,6 +8,9 @@
+ /*                                                             */
+ /* Makefile for Lectern                                        */
+ 
++override("lecterndoc", path() & "/../..")
++override("lecternclient", path() & "/../..")
++
+ if AT_SRC and equal (OS_TYPE, "POSIX")
+   import         ("cmon")
+ end
+Index: lecternclient/src/m3makefile
+--- lecternclient/src/m3makefile.orig	Wed May 29 13:52:36 1996
++++ lecternclient/src/m3makefile	Fri Nov  1 17:20:40 1996
+@@ -4,6 +4,11 @@
+ 
+ /* Last modified on Wed May 29 13:52:36 PDT 1996 by mcjones */
+ 
++% Override the standard definition of after_library_hooks, to prevent
++% building a shared library.
++proc after_library_hooks(x) is
++end
++
+ import("libm3")
+ import("mtex")
+ 
+Index: lecterndoc/src/m3makefile
+--- lecterndoc/src/m3makefile.orig	Thu Mar 10 15:29:55 1994
++++ lecterndoc/src/m3makefile	Fri Nov  1 17:21:44 1996
+@@ -4,6 +4,10 @@
+ /*                                                             */
+ /* Makefile for "LecternDoc" library                           */
+ 
++% Override the standard definition of after_library_hooks, to prevent
++% building a shared library.
++proc after_library_hooks(x) is
++end
+ 
+ import         (libm3)
+ 
+Index: ocr/src/Stub/m3makefile
+--- ocr/src/Stub/m3makefile.orig	Fri Sep 30 14:49:03 1994
++++ ocr/src/Stub/m3makefile	Fri Nov  1 17:24:08 1996
+@@ -4,6 +4,11 @@
+ 
+ /* Last modified on Fri Sep 30 14:49:02 PDT 1994 by mcjones */
+ 
++% Override the standard definition of after_library_hooks, to prevent
++% building a shared library.
++proc after_library_hooks(x) is
++end
++
+ import("libm3")
+ 
+ implementation("OCR_Stub")
diff --git a/print/virtualpaper/pkg-plist b/print/virtualpaper/pkg-plist
index cdfac1628639..624efe0093fe 100644
--- a/print/virtualpaper/pkg-plist
+++ b/print/virtualpaper/pkg-plist
@@ -1,104 +1,12 @@
-bin/LecternClient
-bin/Lectern
 bin/BuildLectern
 bin/EditLectern
-man/man1/Lectern.1
-man/man1/EditLectern.1
-man/man1/LecternClient.1
-man/man1/BuildLectern.1
-lib/m3/FreeBSD2/libm3smalldb.so.353.0
-lib/m3/FreeBSD2/libm3core.so.353.0
-lib/m3/FreeBSD2/libm3configvars.so.353.0
-lib/m3/FreeBSD2/libm3.so.353.0
-lib/m3/FreeBSD2/libset.so.353.0
-lib/m3/FreeBSD2/libGeometry.so.353.0
-lib/m3/FreeBSD2/libm3parseparams.so.353.0
-lib/m3/FreeBSD2/libm3slisp.so.353.0
-lib/m3/FreeBSD2/libTempFiles.so.353.0
-lib/m3/FreeBSD2/libm3tcp.so.353.0
-lib/m3/FreeBSD2/libm3netobj.so.353.0
-lib/m3/FreeBSD2/libm3tk.so.353.0
-lib/m3/FreeBSD2/libstable.so.353.0
-lib/m3/FreeBSD2/libm3X11R4.so.353.0
-lib/m3/FreeBSD2/libPEX.so.353.0
-lib/m3/FreeBSD2/libm3ui.so.353.0
-lib/m3/FreeBSD2/libm3bicycle.so.353.0
-lib/m3/FreeBSD2/libm3tools.so.353.0
-lib/m3/FreeBSD2/libm3vbtkit.so.353.0
-lib/m3/FreeBSD2/libImages.so.353.0
-lib/m3/FreeBSD2/libjvideo.so.353.0
-lib/m3/FreeBSD2/libvideovbt.so.353.0
-lib/m3/FreeBSD2/libm3formsvbtpixmaps.so.353.0
-lib/m3/FreeBSD2/libm3formsvbt.so.353.0
-lib/m3/FreeBSD2/libm3codeview.so.353.0
-lib/m3/FreeBSD2/libm3mg.so.353.0
-lib/m3/FreeBSD2/libm3mgkit.so.353.0
-lib/m3/FreeBSD2/libanim3D.so.353.0
-lib/m3/FreeBSD2/libsynwr.so.353.0
-lib/m3/FreeBSD2/libsynex.so.353.0
-lib/m3/FreeBSD2/libmetasyn.so.353.0
-lib/m3/FreeBSD2/libobliqrt.so.353.0
-lib/m3/FreeBSD2/libobliqlibm3.so.353.0
-lib/m3/FreeBSD2/libobliqlibui.so.353.0
-lib/m3/FreeBSD2/libobliqlibanim.so.353.0
-lib/m3/FreeBSD2/libobliqparse.so.353.0
-lib/m3/FreeBSD2/libobliqprint.so.353.0
-lib/m3/FreeBSD2/libobliq.so.353.0
-lib/m3/FreeBSD2/libobliqlib3D.so.353.0
-lib/m3/FreeBSD2/libm3zeus.so.353.0
-lib/m3/FreeBSD2/liblecternserver.so.353.0
-lib/m3/FreeBSD2/libLecternDoc.so.353.0
-lib/m3/FreeBSD2/libocr.so.353.0
-lib/m3/pkg/lecternclient/FreeBSD2/.M3EXPORTS
-lib/m3/pkg/lecternclient/FreeBSD2/.M3IMPTAB
-lib/m3/pkg/lecternclient/FreeBSD2/.M3WEB
-lib/m3/pkg/lecternclient/FreeBSD2/liblecternserver.a
-lib/m3/pkg/lecternclient/FreeBSD2/liblecternserver.m3x
-lib/m3/pkg/lecternclient/FreeBSD2/liblecternserver.so.353.0
-lib/m3/pkg/lecternclient/src/LecternServer.i3
-lib/m3/pkg/lecternclient/src/LecternClient.i3
-lib/m3/pkg/lecterndoc/FreeBSD2/.M3EXPORTS
-lib/m3/pkg/lecterndoc/FreeBSD2/.M3IMPTAB
-lib/m3/pkg/lecterndoc/FreeBSD2/.M3WEB
-lib/m3/pkg/lecterndoc/FreeBSD2/libLecternDoc.a
-lib/m3/pkg/lecterndoc/FreeBSD2/libLecternDoc.m3x
-lib/m3/pkg/lecterndoc/FreeBSD2/libLecternDoc.so.353.0
-lib/m3/pkg/lecterndoc/src/LecternDoc.i3
-lib/m3/pkg/lectern/FreeBSD2/.M3EXPORTS
-lib/m3/pkg/lectern/FreeBSD2/.M3IMPTAB
-lib/m3/pkg/lectern/FreeBSD2/.M3WEB
-lib/m3/pkg/lectern/FreeBSD2/LecternBundle.i3
-lib/m3/pkg/lectern/src/Links.i3
-lib/m3/pkg/lectern/src/ViewAreaVBT.i3
-lib/m3/pkg/lectern/src/ThumbnailVBT.i3
-lib/m3/pkg/lectern/src/LecternOCR.i3
-lib/m3/pkg/lectern/src/MyFileBrowserVBT.i3
-lib/m3/pkg/lectern/src/Find.i3
-lib/m3/pkg/ocr/FreeBSD2/.M3EXPORTS
-lib/m3/pkg/ocr/FreeBSD2/.M3IMPTAB
-lib/m3/pkg/ocr/FreeBSD2/.M3WEB
-lib/m3/pkg/ocr/FreeBSD2/libocr.a
-lib/m3/pkg/ocr/FreeBSD2/libocr.m3x
-lib/m3/pkg/ocr/FreeBSD2/libocr.so.353.0
-lib/m3/pkg/ocr/src/Common/OCR.i3
-lib/m3/pkg/buildlectern/FreeBSD2/.M3EXPORTS
-lib/m3/pkg/buildlectern/FreeBSD2/.M3IMPTAB
-lib/m3/pkg/buildlectern/FreeBSD2/.M3WEB
-lib/m3/pkg/buildlectern/FreeBSD2/FromPSBundle.i3
-lib/m3/pkg/buildlectern/FreeBSD2/BBoxSeqRep.i3
-lib/m3/pkg/buildlectern/FreeBSD2/BBoxSeq.i3
-lib/m3/pkg/buildlectern/src/OCR_PS.i3
-lib/m3/pkg/buildlectern/src/OSUtils.i3
-lib/m3/pkg/buildlectern/src/Cscale.i3
-lib/m3/pkg/buildlectern/src/BBox.i3
-lib/m3/pkg/buildlectern/src/LGM.i3
-lib/m3/pkg/buildlectern/src/FromPS.i3
-lib/m3/pkg/editlectern/FreeBSD2/.M3EXPORTS
-lib/m3/pkg/editlectern/FreeBSD2/.M3IMPTAB
-lib/m3/pkg/editlectern/FreeBSD2/.M3WEB
-lib/m3/pkg/editlectern/FreeBSD2/EditLecternBundle.i3
-lib/m3/www/LecternClient.1.html
-lib/m3/www/Lectern.1.html
+bin/Lectern
+bin/LecternClient
 lib/m3/www/BuildLectern.1.html
 lib/m3/www/EditLectern.1.html
-@exec /sbin/ldconfig -m %D/lib/m3/pkg/FreeBSD2
+lib/m3/www/Lectern.1.html
+lib/m3/www/LecternClient.1.html
+man/man1/BuildLectern.1.gz
+man/man1/EditLectern.1.gz
+man/man1/Lectern.1.gz
+man/man1/LecternClient.1.gz