Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Mar 2000 15:58:38 +0200 (EET)
From:      "Maxim Sobolev" <sobomax@altavista.net>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/17457: [PATCH] Update of the Nedit(editors/nedit) port to the new 5.1.1 version
Message-ID:  <200003181358.PAA01108@vega.vega.com>

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

>Number:         17457
>Category:       ports
>Synopsis:       [PATCH] Update of the Nedit(editors/nedit) port to the new 5.1.1 version
>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:   Sat Mar 18 06:00:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Maxim Sobolev
>Release:        FreeBSD 3.4-STABLE i386
>Organization:
Vega International Capital
>Environment:

	

>Description:

Update of the Nedit(editors/nedit) port to the new 5.1.1 version. Also several
small cleanups provided:

+ CFLAGS received appropriate respect
+ X11BASE now used insted of PREFIX in -I and -L compiler directives
+ patches/patch-aa has been split into the smaller chunks (one chunk for each
  file being patched)
+ pkg/DESCR slightly modified to reflect Nedit's LessTif frindiness

>How-To-Repeat:

	

>Fix:

diff -ruN /usr/ports/editors/nedit/Makefile nedit/Makefile
--- /usr/ports/editors/nedit/Makefile	Fri Mar  3 10:03:47 2000
+++ nedit/Makefile	Sat Mar 18 15:46:30 2000
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	nedit
-# Version required:			5.0.2
+# Version required:			5.1.1
 # Date created:				7 April 1996
 # Whom:	Daniel Eischen <deischen@iworks.InterWorks.org>
 #
 # $FreeBSD: ports/editors/nedit/Makefile,v 1.17 2000/03/02 12:32:26 deischen Exp $
 #
 
-DISTNAME=	nedit-5.0.2
+DISTNAME=	nedit-5.1.1
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.nedit.org/pub/v5_0_2/ \
-		ftp://ftp.nedit.org/pub/v5_0_2/contrib/
-DISTFILES=	nedit_source.tar.gz nedit.app-defaults
+MASTER_SITES=	ftp://ftp.nedit.org/pub/v5_1_1/ \
+		ftp://ftp.nedit.org/pub/contrib/misc/
+DISTFILES=	nedit-5.1.1-src.tar.gz nedit-5.1.app-defaults
 
 MAINTAINER=	deischen@freebsd.org
 
@@ -18,11 +18,11 @@
 
 REQUIRES_MOTIF=	yes
 USE_X_PREFIX=	yes
-NO_WRKSUBDIR=	yes
-EXTRACT_ONLY=	nedit_source.tar.gz
+EXTRACT_ONLY=	nedit-5.1.1-src.tar.gz
 MAN1=		nedit.1 nc.1
+ALL_TARGET=	freebsd_nedit
 
 post-extract:
-	${CP} ${DISTDIR}/nedit.app-defaults ${WRKSRC}/NEdit.ad
+		@${CP} ${DISTDIR}/nedit-5.1.app-defaults ${WRKSRC}/NEdit.ad
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/editors/nedit/files/md5 nedit/files/md5
--- /usr/ports/editors/nedit/files/md5	Mon Nov 16 14:39:16 1998
+++ nedit/files/md5	Sat Mar 18 15:14:32 2000
@@ -1,2 +1,2 @@
-MD5 (nedit_source.tar.gz) = f4eb558c83ecb542e07766e2775c1874
-MD5 (nedit.app-defaults) = 498caafc2c001e9bfed42b0b1811862c
+MD5 (nedit-5.1.1-src.tar.gz) = dba0970c60debada237ca852b5f57ec8
+MD5 (nedit-5.1.app-defaults) = 36c5e660039e0bd4b4d05df609b505bb
diff -ruN /usr/ports/editors/nedit/patches/patch-aa nedit/patches/patch-aa
--- /usr/ports/editors/nedit/patches/patch-aa	Mon Nov 16 14:39:17 1998
+++ nedit/patches/patch-aa	Sat Mar 18 15:27:53 2000
@@ -1,93 +1,16 @@
-*** Makefile.orig	Wed Oct 22 15:42:20 1997
---- Makefile	Sat Nov  8 23:39:51 1997
-***************
-*** 2,15 ****
-  # Makefile for NEdit text editor
-  #
-  # targets: sgi_nedit, hp_nedit, ultrix_nedit, ibm_nedit, sunos_nedit,
-! #	   solaris_nedit, dec_nedit, linux_nedit
-  #
-  # Builds an intermediate library in util directory, then builds
-  # the nedit executable in the source directory
-  #
-  
-! all:
-! 	@echo "Please specify target"
-  
-  sgi_nedit:
-  	(cd util; $(MAKE) -f Makefile.sgi libNUtil.a)
---- 2,15 ----
-  # Makefile for NEdit text editor
-  #
-  # targets: sgi_nedit, hp_nedit, ultrix_nedit, ibm_nedit, sunos_nedit,
-! #	   solaris_nedit, dec_nedit, linux_nedit, freebsd_nedit
-  #
-  # Builds an intermediate library in util directory, then builds
-  # the nedit executable in the source directory
-  #
-  
-! all: freebsd_nedit
-! 
-  
-  sgi_nedit:
-  	(cd util; $(MAKE) -f Makefile.sgi libNUtil.a)
-***************
-*** 39,44 ****
---- 39,54 ----
-  	(cd util; $(MAKE) -f Makefile.dec libNUtil.a)
-  	(cd source; $(MAKE) -f Makefile.dec nedit nc)
-  
-+ 
-+ freebsd_nedit:
-+ 	(cd util; make -f Makefile.freebsd libNUtil.a)
-+ 	(cd source; make -f Makefile.freebsd nedit nc)
+--- Makefile.orig	Thu Jan  6 06:04:45 2000
++++ Makefile	Sat Mar 18 15:26:49 2000
+@@ -25,3 +25,13 @@
+ clean:
+ 	(cd util; $(MAKE) -f Makefile.common clean)
+ 	(cd source; $(MAKE) -f Makefile.common clean)
++
++freebsd_nedit:
++	(cd util; make -f Makefile.freebsd libNUtil.a)
++	(cd source; make -f Makefile.freebsd nedit nc)
 + 	
-+ install::
-+ 	(cd source; make -f Makefile.freebsd install)
-+ 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 nedit.man ${PREFIX}/man/man1/nedit.1
-+ 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 nc.man ${PREFIX}/man/man1/nc.1
-+ 	${INSTALL} ${COPY} -m 644 NEdit.ad ${X11BASE}/lib/X11/app-defaults/NEdit
-  linux_nedit:
-  	(cd util; $(MAKE) -f Makefile.linux libNUtil.a)
-  	(cd source; $(MAKE) -f Makefile.linux nedit nc)
-*** util/Makefile.freebsd.orig	Sun Apr  7 18:09:19 1996
---- util/Makefile.freebsd	Sun Apr  7 17:32:32 1996
-***************
-*** 0 ****
---- 1,8 ----
-+ CC=cc
-+ AR=ar
-+ 
-+ # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS
-+ CFLAGS=-O -I${PREFIX}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM
-+ LIBS= ${MOTIFLIB} -L${PREFIX}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11
-+ 
-+ include Makefile.common
-*** source/Makefile.freebsd.orig	Sun Apr  7 18:10:29 1996
---- source/Makefile.freebsd	Sun Apr  7 17:38:04 1996
-***************
-*** 0 ****
---- 1,8 ----
-+ CC=cc
-+ AR=ar
-+ 
-+ # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS
-+ CFLAGS=-O -I${PREFIX}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM
-+ LIBS= ${MOTIFLIB} -L${PREFIX}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11
-+ 
-+ include Makefile.common
-*** source/Makefile.common.orig	Sun Apr  7 17:51:54 1996
---- source/Makefile.common	Sun Apr  7 20:07:48 1996
-***************
-*** 16,21 ****
---- 16,25 ----
-  nc: nc.o
-  	$(CC) $(CFLAGS) nc.o ../util/libNUtil.a $(LIBS) -o $@
-  
-+ install:: nedit nc
-+ 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nedit ${PREFIX}/bin
-+ 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nc ${PREFIX}/bin
-+ 
-  help.o: help.c
-  	$(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@
-  
++install:
++	(cd source; make -f Makefile.freebsd install)
++	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 nedit.man ${PREFIX}/man/man1/nedit.1
++	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 nc.man ${PREFIX}/man/man1/nc.1
++	${INSTALL} ${COPY} -m 644 NEdit.ad ${X11BASE}/lib/X11/app-defaults/NEdit
diff -ruN /usr/ports/editors/nedit/patches/patch-ab nedit/patches/patch-ab
--- /usr/ports/editors/nedit/patches/patch-ab	Thu Jan  1 03:00:00 1970
+++ nedit/patches/patch-ab	Sat Mar 18 15:33:50 2000
@@ -0,0 +1,11 @@
+--- util/Makefile.freebsd.orig	Sat Mar 18 15:29:38 2000
++++ util/Makefile.freebsd	Sat Mar 18 15:30:49 2000
+@@ -0,0 +1,8 @@
++CC?=cc
++AR?=ar
++
++# For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS
++CFLAGS += -I${X11BASE}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM
++LIBS	= ${MOTIFLIB} -L${X11BASE}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11
++
++include Makefile.common
diff -ruN /usr/ports/editors/nedit/patches/patch-ac nedit/patches/patch-ac
--- /usr/ports/editors/nedit/patches/patch-ac	Thu Jan  1 03:00:00 1970
+++ nedit/patches/patch-ac	Sat Mar 18 15:28:29 2000
@@ -0,0 +1,15 @@
+--- source/Makefile.common.orig	Wed Dec 15 05:58:24 1999
++++ source/Makefile.common	Sat Mar 18 15:23:33 2000
+@@ -14,7 +14,11 @@
+ 	
+ nc: nc.o
+ 	$(CC) $(CFLAGS) nc.o ../util/libNUtil.a $(LIBS) -o $@
+-	
++
++install: nedit nc
++	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nedit ${PREFIX}/bin
++	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nc ${PREFIX}/bin
++
+ help.o: help.c
+ 	$(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@
+ 
diff -ruN /usr/ports/editors/nedit/patches/patch-ad nedit/patches/patch-ad
--- /usr/ports/editors/nedit/patches/patch-ad	Thu Jan  1 03:00:00 1970
+++ nedit/patches/patch-ad	Sat Mar 18 15:34:16 2000
@@ -0,0 +1,11 @@
+--- source/Makefile.freebsd.orig	Sat Mar 18 15:29:38 2000
++++ source/Makefile.freebsd	Sat Mar 18 15:32:30 2000
+@@ -0,0 +1,8 @@
++CC?=cc
++AR?=ar
++
++# For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS
++CFLAGS += -I${X11BASE}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM
++LIBS	= ${MOTIFLIB} -L${X11BASE}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11
++
++include Makefile.common
diff -ruN /usr/ports/editors/nedit/pkg/DESCR nedit/pkg/DESCR
--- /usr/ports/editors/nedit/pkg/DESCR	Wed Nov 10 10:18:21 1999
+++ nedit/pkg/DESCR	Sat Mar 18 15:44:51 2000
@@ -7,6 +7,7 @@
 For users of older style Unix editors, welcome to the world of
 mouse-based editing!
 
-This port requires Motif to build.
+This port requires Motif to build, however it works reasonably well
+with the free Motif clone LessTif.
 
 WWW: http://www.nedit.org


>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?200003181358.PAA01108>