[Midnightbsd-cvs] mports: editors/nvi-devel: update to 1.81.6

crash at midnightbsd.org crash at midnightbsd.org
Tue Sep 9 16:52:01 EDT 2008 

Log Message:
-----------
update to 1.81.6

Modified Files:
--------------
    mports/editors/nvi-devel:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/editors/nvi-devel/files:
        patch-configure (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/editors/nvi-devel/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L editors/nvi-devel/pkg-plist -L editors/nvi-devel/pkg-plist -u -r1.1 -r1.2
--- editors/nvi-devel/pkg-plist
+++ editors/nvi-devel/pkg-plist
@@ -1,6 +1,6 @@
-bin/ex
-bin/vi
-bin/view
+bin/nex
+bin/nvi
+bin/nview
 lib/libvi.a
 lib/libvi.la
 lib/libvi.so
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/editors/nvi-devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L editors/nvi-devel/Makefile -L editors/nvi-devel/Makefile -u -r1.1 -r1.2
--- editors/nvi-devel/Makefile
+++ editors/nvi-devel/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	nvi
-PORTVERSION=	1.81.5
+PORTVERSION=	1.81.6
 CATEGORIES=	editors
-MASTER_SITES=	http://193.190.253.81/~skimo/nvi/devel/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dd
-
+MASTER_SITES=	http://www.kotnet.org/~skimo/nvi/devel/ \
+                
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Development snapshot of the world-renown nvi editor
 LICENSE=	bsd3
@@ -23,19 +21,19 @@
 WRKSRC=			${WRKDIR}/${DISTNAME}/build.unix
 USE_AUTOTOOLS=		libtool:15
 USE_LDCONFIG=		yes
-CONFIGURE_ARGS+=	--with-db3=${LOCALBASE}
+CONFIGURE_ARGS+=        --with-db-prefix=${LOCALBASE} \
+  	                         --program-prefix=n
 CONFIGURE_SCRIPT=	../dist/configure
-MAN1=			ex.1 vi.1 view.1
-
-.include <bsd.port.pre.mk>
+MAN1=			nex.1 nvi.1 nview.1
 
-post-configure:
-	${ECHO_CMD} "#undef HAVE_SYS_SELECT_H" >> ${WRKSRC}/config.h
+# configure is 555, so you can't do a "make configure" as non-root.
+post-patch:
+	@${CHMOD} 755 ${WRKSRC}/../dist/configure
 
 post-install:
-.for __p in ex vi view
+.for __p in nex nvi nview
 	@# XXX: Hack the Makefile in the distribution so this isn't necessary.
 	${RM} ${PREFIX}/man/cat1/${__p}.0
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/editors/nvi-devel/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L editors/nvi-devel/distinfo -L editors/nvi-devel/distinfo -u -r1.1 -r1.2
--- editors/nvi-devel/distinfo
+++ editors/nvi-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (nvi-1.81.5.tar.bz2) = 82262d08803b364033dd7ab38190305a
-SHA256 (nvi-1.81.5.tar.bz2) = e40e1810e5aa39ebcea4c99b4cabd385dd5c8c817d4f7eb74741939623d97eaf
-SIZE (nvi-1.81.5.tar.bz2) = 1274353
+MD5 (nvi-1.81.6.tar.bz2) = 88d1e23115ee9f2961186b62e55f5704
+SHA256 (nvi-1.81.6.tar.bz2) = 3441b8e3247b2b6dd19b5fd38355fe6593b2a92e960ecb3dd00d676f63d06b59
+SIZE (nvi-1.81.6.tar.bz2) = 1758309
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/editors/nvi-devel/files/patch-configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -L editors/nvi-devel/files/patch-configure -L editors/nvi-devel/files/patch-configure -u -r1.1 -r1.2
--- editors/nvi-devel/files/patch-configure
+++ editors/nvi-devel/files/patch-configure
@@ -1,41 +1,65 @@
-# This patch makes the following changes:
-#
-#	- -ldb -> -ldb3
-#	- db3 include files in include/db3, not include
-#
-# As far as I can tell, both of these are FreeBSDisms, so this patch
-# should not be submitted to the vendor.
-
---- ../dist/configure~	Sun Feb 10 23:08:14 2002
-+++ ../dist/configure	Sun Feb 10 23:08:11 2002
-@@ -10676,17 +10676,17 @@
- saveLDFLAGS="$LDFLAGS"
- if test "x$with_db3" != "x"; then
- 	LDFLAGS="-L$with_db3/lib $LDFLAGS"
--	CFLAGS="-I$with_db3/include $CFLAGS"
-+	CFLAGS="-I$with_db3/include/db3 $CFLAGS"
- fi;
- 
--echo $ac_n "checking for db_create in -ldb""... $ac_c" 1>&6
--echo "configure:10684: checking for db_create in -ldb" >&5
-+echo $ac_n "checking for db_create in -ldb3""... $ac_c" 1>&6
-+echo "configure:10684: checking for db_create in -ldb3" >&5
- ac_lib_var=`echo db'_'db_create | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb3  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 10692 "configure"
- #include "confdefs.h"
-@@ -10835,7 +10835,7 @@
+--- ../dist/configure.orig	2007-11-18 08:43:54.000000000 -0800
++++ ../dist/configure	2008-06-15 11:35:32.000000000 -0700
+@@ -19433,10 +19433,10 @@ fi
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool'
+ 
+ # Prevent multiple expansion
+ 
+@@ -27631,6 +27631,8 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <stdlib.h>
++#include <stdio.h>
+ main(){char buf[20]; exit(sprintf(buf, "XXX") != 3);}
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -28624,7 +28626,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <stdio.h>
+-int fprintf ();
++/*int fprintf ();*/
+ 
+ int
+ main ()
+@@ -28755,18 +28757,19 @@ fi
+ SAVELDFLAGS="$LDFLAGS"
+ if test "x$with_db_prefix" != "x"; then
+ 	LDFLAGS="-L$with_db_prefix/lib $LDFLAGS"
+-	CPPFLAGS="-I$with_db_prefix/include $CPPFLAGS"
++	CPPFLAGS="-I$with_db_prefix/include/db3 $CPPFLAGS"
+ fi
+ if test "$with_db_type" != db1; then
+ 	SAVELIBS="$LIBS"
+ 
+-	LIBS="$LIBS -ldb"
++	LIBS="$LIBS -ldb3"
+ 	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <sys/stddef.h>
+ #include <db.h>
+ int
+ main ()
+@@ -28958,7 +28961,7 @@ _ACEOF
  	dl_src=../common/dldb.c
  	LIBS="-ldl $LIBS"
  else
 -	LIBS="-ldb $LIBS"
 +	LIBS="-ldb3 $LIBS"
- 	if test "X$with_db3" != "X"; then
- 		LDFLAGS="`echo $with_db3/lib | sed "$LRscript"` $LDFLAGS"
+ 	if test "X$with_db_prefix" != "X"; then
+ 		LDFLAGS="`echo $with_db_prefix/lib | sed "$LRscript"` $LDFLAGS"
  	fi
+

More information about the Midnightbsd-cvs mailing list