Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Jan 2001 12:24:41 -0800 (PST)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/24545: Update port: editors/nvi-perl
Message-ID:  <200101222024.f0MKOfU86796@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         24545
>Category:       ports
>Synopsis:       Update port: editors/nvi-perl
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 22 12:30:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix compilation error in -current
- Support MAN/MLINKS properly

New file:
files/patch-ac

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/editors/nvi-perl/Makefile editors/nvi-perl/Makefile
--- /usr/ports/editors/nvi-perl/Makefile	Tue Jan  9 21:53:16 2001
+++ editors/nvi-perl/Makefile	Tue Jan 23 02:55:07 2001
@@ -5,23 +5,30 @@
 # $FreeBSD: ports/editors/nvi-perl/Makefile,v 1.15 2001/01/09 05:57:02 itojun Exp $
 #
 
-PORTNAME=	nvi-perl
+PORTNAME=	nvi
 PORTVERSION=	1.79
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://sleepy.vwh.net/pub/ \
 		ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
-DISTNAME=	nvi-${PORTVERSION}
+PKGNAMESUFFIX=	-perl
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/build
-GNU_CONFIGURE=	yes
-USE_PERL5=	yes
 # can't say PATCH_DIST_STRIP=-p1 because contains files outside ${WRKSRC}
 PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -p0
 PATCH_ARGS=	-d ${WRKSRC}/.. --forward --quiet -E -p0
+WRKSRC=		${WRKDIR}/${DISTNAME}/build
 
+USE_PERL5=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"'
 CONFIGURE_ARGS=	--enable-perlinterp --program-prefix=pn
+
+MAN1=		pnvi.1
+MLINKS=		pnvi.1 pnex.1  pnvi.1 pnview.1
+
+post-patch:
+	${LN} -s /usr/include/sys/queue.h ${WRKSRC}/../include/sys/queue_dist.h
 
 .include <bsd.port.mk>
diff -urN /usr/ports/editors/nvi-perl/files/patch-ac editors/nvi-perl/files/patch-ac
--- /usr/ports/editors/nvi-perl/files/patch-ac	Thu Jan  1 09:00:00 1970
+++ editors/nvi-perl/files/patch-ac	Tue Jan 23 02:32:22 2001
@@ -0,0 +1,51 @@
+--- include/sys/queue.h.old	Wed Jan 10 07:16:01 2001
++++ include/sys/queue.h	Wed Jan 10 07:17:02 2001
+@@ -33,8 +33,10 @@
+  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
+  */
+ 
+-#ifndef	_SYS_QUEUE_H_
+-#define	_SYS_QUEUE_H_
++#ifndef	_SYS_QUEUE_HACK_H_
++#define	_SYS_QUEUE_HACK_H_
++
++#include <sys/queue_dist.h>
+ 
+ /*
+  * This file defines three types of data structures: lists, tail queues,
+@@ -65,6 +67,7 @@
+  * For details on the use of these macros, see the queue(3) manual page.
+  */
+ 
++#ifndef LIST_HEAD
+ /*
+  * List definitions.
+  */
+@@ -114,7 +117,9 @@
+ 		    (elm)->field.le_prev;				\
+ 	*(elm)->field.le_prev = (elm)->field.le_next;			\
+ }
++#endif /* LIST_HEAD */
+ 
++#ifndef TAILQ_HEAD
+ /*
+  * Tail queue definitions.
+  */
+@@ -180,7 +185,9 @@
+ 		(head)->tqh_last = (elm)->field.tqe_prev;		\
+ 	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
+ }
++#endif /* TAILQ_HEAD */
+ 
++#ifndef CIRCLEQ_HEAD
+ /*
+  * Circular queue definitions.
+  */
+@@ -256,4 +263,6 @@
+ 		(elm)->field.cqe_prev->field.cqe_next =			\
+ 		    (elm)->field.cqe_next;				\
+ }
+-#endif	/* !_SYS_QUEUE_H_ */
++#endif /* CIRCLEQ_HEAD */
++
++#endif	/* !_SYS_QUEUE_HACK_H_ */
diff -urN /usr/ports/editors/nvi-perl/pkg-plist editors/nvi-perl/pkg-plist
--- /usr/ports/editors/nvi-perl/pkg-plist	Fri Feb 20 01:50:06 1998
+++ editors/nvi-perl/pkg-plist	Thu Jan 18 03:40:20 2001
@@ -1,10 +1,6 @@
-bin/pnvi
 bin/pnex
+bin/pnvi
 bin/pnview
-man/man1/pnvi.1
-man/man1/pnex.1
-man/man1/pnview.1
-share/vi/recover
 share/vi/catalog/dutch
 share/vi/catalog/english
 share/vi/catalog/french
@@ -12,16 +8,17 @@
 share/vi/catalog/ru_SU.KOI8-R
 share/vi/catalog/spanish
 share/vi/catalog/swedish
+share/vi/perl/VI.pm
 share/vi/perl/forall.pl
 share/vi/perl/make.pl
 share/vi/perl/tk.pl
 share/vi/perl/wc.pl
-share/vi/perl/VI.pm
+share/vi/recover
 share/vi/tcl/errors.tcl
 share/vi/tcl/gnats.tcl
 share/vi/tcl/mailprocs.tcl
 share/vi/tcl/wc.tcl
-@dirrm share/vi/catalog
-@dirrm share/vi/perl
 @dirrm share/vi/tcl
+@dirrm share/vi/perl
+@dirrm share/vi/catalog
 @dirrm share/vi


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200101222024.f0MKOfU86796>