From owner-freebsd-bugs  Thu Mar 28 15:10:05 1996
Return-Path: owner-bugs
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id PAA16414
          for bugs-outgoing; Thu, 28 Mar 1996 15:10:05 -0800 (PST)
Received: (from gnats@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id PAA16408
          Thu, 28 Mar 1996 15:10:02 -0800 (PST)
Resent-Date: Thu, 28 Mar 1996 15:10:02 -0800 (PST)
Resent-Message-Id: <199603282310.PAA16408@freefall.freebsd.org>
Resent-From: gnats (GNATS Management)
Resent-To: freebsd-bugs
Resent-Reply-To: FreeBSD-gnats@freefall.FreeBSD.org,
        obrien@Nuxi.cs.ucdavis.edu
Received: from relay.nuxi.com (nuxi.cs.ucdavis.edu [128.120.56.38])
          by freefall.freebsd.org (8.7.3/8.7.3) with SMTP id PAA15762
          for <FreeBSD-gnats-submit@freebsd.org>; Thu, 28 Mar 1996 15:00:51 -0800 (PST)
Received: (from obrien@localhost) by relay.nuxi.com (8.6.12/8.6.12) id PAA03555; Thu, 28 Mar 1996 15:01:03 -0800
Message-Id: <199603282301.PAA03555@relay.nuxi.com>
Date: Thu, 28 Mar 1996 15:01:03 -0800
From: "David E. O'Brien" <obrien@Nuxi.cs.ucdavis.edu>
Reply-To: obrien@Nuxi.cs.ucdavis.edu
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/1109: mods to vim-3.0 port
Sender: owner-bugs@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk


>Number:         1109
>Category:       ports
>Synopsis:       mods to vim-3.0 port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 28 15:10:01 PST 1996
>Last-Modified:
>Originator:     David E. O'Brien
>Organization:
University of California, Davis
>Release:        FreeBSD 2.1.0-RELEASE i386
>Environment:

	ports-current

>Description:

	The current Vim-3.0 port assumes you have X11R6 libraries around
	at compile/runtime.

	The current Vim-3.0 pkg assumes you have X11R6 libraries around
	at runtime.

	Currently the installed files do not adhear to hier(7).

>How-To-Repeat:

	n/a

>Fix:

	Replace current pkg/PLIST and patches/patch-aa with the following:

PLIST:
bin/vim
share/misc/vim.hlp
share/man/man1/vim.1.gz

patch-aa:
--- makefile.unix.orig	Tue Aug  9 21:54:11 1994
+++ makefile.unix	Thu Mar 28 14:36:26 1996
@@ -55,14 +55,17 @@
 ### root directory for X11 files (unless overruled in hardware-dependend part)
 ### Unfortunately there is no standard for these, everybody puts them
 ### somewhere else
-X11LIBDIR = /usr/openwin/lib
-X11INCDIR = /usr/openwin/include
+#X11LIBDIR = /usr/openwin/lib
+#X11INCDIR = /usr/openwin/include
 ### for some hpux systems:
 #X11LIBDIR = /usr/lib/X11R5
 #X11INCDIR = /usr/include/X11R5
+### for FreeBSD 2.x systems:
+X11LIBDIR = /usr/X11R6/lib
+X11INCDIR = /usr/X11R6/include
 
 ### Prefix for location of files
-PREFIX = /usr/local
+PREFIX += $(PREFIX)
 
 ### Location of binary
 BINLOC = $(PREFIX)/bin
@@ -71,10 +74,10 @@
 TARGET = vim
 
 ### Location of man page
-MANLOC = $(PREFIX)/man/man1
+MANLOC = $(PREFIX)/share/man/man1
 
 ### Location of help file
-HELPLOC = $(PREFIX)/lib
+HELPLOC = $(PREFIX)/share/misc
 
 ### Program to run on installed binary
 STRIP = strip
@@ -157,9 +160,9 @@
 # FreeBSD and NetBSD with Xfree (TESTED for FreeBSD)
 # standard cc with optimizer
 #
-#MACHINE = -DBSD_UNIX -DUSE_LOCALE -DUSE_X11
-#CC=cc -O -L/usr/X386/lib -I/usr/X386/include
-#LIBS = -ltermlib -lX11
+MACHINE = -DBSD_UNIX -DUSE_LOCALE # -DUSE_X11
+CC=cc -O -Wall # -I$(X11INCDIR)
+LIBS = -ltermlib # -L$(X11LIBDIR) -lX11
 
 # FreeBSD and NetBSD with Xfree (TESTED for FreeBSD)
 # gcc with optimizer
>Audit-Trail:
>Unformatted: