[Midnightbsd-cvs] mports [17642] fix libtool

Sun Sep 28 18:50:48 EDT 2014

Revision: 17642
          http://svnweb.midnightbsd.org/mports/?rev=17642
Author:   laffer1
Date:     2014-09-28 18:50:46 -0400 (Sun, 28 Sep 2014)
Log Message:
-----------
fix libtool

Modified Paths:
--------------
    trunk/editors/nvi-devel/Makefile
    trunk/editors/nvi-devel/files/patch-configure
    trunk/editors/nvi-devel/pkg-plist

Property Changed:
----------------
    trunk/editors/nvi-devel/files/patch-config.h.in
    trunk/editors/nvi-devel/files/patch-configure

Modified: trunk/editors/nvi-devel/Makefile
===================================================================

--- trunk/editors/nvi-devel/Makefile	2014-09-28 22:49:31 UTC (rev 17641)
+++ trunk/editors/nvi-devel/Makefile	2014-09-28 22:50:46 UTC (rev 17642)
@@ -2,7 +2,7 @@
 
 PORTNAME=	nvi
 PORTVERSION=	1.81.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/ \
 		http://www.kotnet.org/~skimo/nvi/devel/
@@ -18,14 +18,13 @@
 WIDECHAR_DESC=	Enable wide-character support (UTF-8)
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/build.unix
-USE_AUTOTOOLS=		libtool
+GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
-USES=			iconv pkgconfig tar:bzip2
+USES=			iconv libtool pkgconfig tar:bzip2
 USE_BDB=		42+
 CONFIGURE_ARGS+=	--with-db-prefix=${LOCALBASE} \
 			--program-prefix=n
 CONFIGURE_SCRIPT=	../dist/configure
-MAN1=			nex.1 nvi.1 nview.1
 
 .include <bsd.mport.options.mk>
 
@@ -38,15 +37,10 @@
 
 # configure is 555, so you can't do a "make configure" as non-root.
 post-patch:
-	${REINPLACE_CMD} -e 's,%%LIBTOOL%%,${LIBTOOL},g ; \
-		s,%%LTMAIN%%,${LTMAIN},g ; \
-		s,-ldb,-l${BDB_LIB_NAME},g' ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e '/libvi_la_LIBADD =/s,$$, ${ICONV_LIB},' \
+		${WRKSRC}/../dist/Makefile.in
+	@${REINPLACE_CMD} -e 's,-ldb,-l${BDB_LIB_NAME},g' \
+		${WRKSRC}/../dist/configure
 	@${CHMOD} 755 ${WRKSRC}/../dist/configure
 
-post-install:
-.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.mk>

Index: trunk/editors/nvi-devel/files/patch-config.h.in
===================================================================
--- trunk/editors/nvi-devel/files/patch-config.h.in	2014-09-28 22:49:31 UTC (rev 17641)
+++ trunk/editors/nvi-devel/files/patch-config.h.in	2014-09-28 22:50:46 UTC (rev 17642)

Property changes on: trunk/editors/nvi-devel/files/patch-config.h.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/editors/nvi-devel/files/patch-configure
===================================================================
--- trunk/editors/nvi-devel/files/patch-configure	2014-09-28 22:49:31 UTC (rev 17641)
+++ trunk/editors/nvi-devel/files/patch-configure	2014-09-28 22:50:46 UTC (rev 17642)
@@ -1,27 +1,6 @@
 --- ../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=" %%LTMAIN%%"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) %%LIBTOOL%%'
- 
- # Prevent multiple expansion
- 
-@@ -22335,6 +22335,7 @@
- #define USE_ICONV 1
- _ACEOF
- 
-+LIBS="${LIBS} -liconv"
- 
- for ac_func in iswblank
- do
-@@ -27631,6 +27632,8 @@
+@@ -27631,6 +27631,8 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -30,7 +9,7 @@
  main(){char buf[20]; exit(sprintf(buf, "XXX") != 3);}
  _ACEOF
  rm -f conftest$ac_exeext
-@@ -28624,7 +28627,7 @@
+@@ -28624,7 +28626,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stdio.h>
@@ -39,10 +18,10 @@
  
  int
  main ()
-@@ -28755,5 +28758,6 @@
+@@ -28755,5 +28757,6 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
-+#include <sys/stddef.h>
++#include <stddef.h>
  #include <db.h>
  int
  main ()


Property changes on: trunk/editors/nvi-devel/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/editors/nvi-devel/pkg-plist
===================================================================
--- trunk/editors/nvi-devel/pkg-plist	2014-09-28 22:49:31 UTC (rev 17641)
+++ trunk/editors/nvi-devel/pkg-plist	2014-09-28 22:50:46 UTC (rev 17642)
@@ -2,26 +2,29 @@
 bin/nvi
 bin/nview
 lib/libvi.a
-lib/libvi.la
 lib/libvi.so
 lib/libvi.so.0
+lib/libvi.so.0.0.0
+man/man1/nex.1.gz
+man/man1/nvi.1.gz
+man/man1/nview.1.gz
+share/vi/catalog/dutch
+share/vi/catalog/english
+share/vi/catalog/french
 share/vi/catalog/german
+share/vi/catalog/ru_SU.KOI8-R
 share/vi/catalog/spanish
-share/vi/catalog/ru_SU.KOI8-R
 share/vi/catalog/swedish
-share/vi/catalog/french
-share/vi/catalog/english
-share/vi/catalog/dutch
+share/vi/perl/forall.pl
+share/vi/perl/make.pl
+share/vi/perl/tk.pl
+share/vi/perl/wc.pl
+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
-share/vi/perl/wc.pl
-share/vi/perl/tk.pl
-share/vi/perl/make.pl
-share/vi/perl/forall.pl
 @dirrm share/vi/perl
-share/vi/tcl/wc.tcl
-share/vi/tcl/mailprocs.tcl
-share/vi/tcl/gnats.tcl
-share/vi/tcl/errors.tcl
-share/vi/recover
 @dirrm share/vi/tcl
 @dirrm share/vi

