Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Jun 2016 06:20:45 +0000 (UTC)
From:      Johan van Selst <johans@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416496 - head/devel/editline
Message-ID:  <201606070620.u576KjK0019834@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: johans
Date: Tue Jun  7 06:20:44 2016
New Revision: 416496
URL: https://svnweb.freebsd.org/changeset/ports/416496

Log:
  Update to editline 1.15.2 (bugfix release)
  Rename editline.3 to libeditline.3 to avoid conflict with libedit

Modified:
  head/devel/editline/Makefile
  head/devel/editline/distinfo
  head/devel/editline/pkg-plist

Modified: head/devel/editline/Makefile
==============================================================================
--- head/devel/editline/Makefile	Tue Jun  7 05:43:06 2016	(r416495)
+++ head/devel/editline/Makefile	Tue Jun  7 06:20:44 2016	(r416496)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	editline
-PORTVERSION=	1.15.1
+PORTVERSION=	1.15.2
 CATEGORIES=	devel
 
 MAINTAINER=	johans@FreeBSD.org
@@ -19,9 +19,12 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 PORTDOCS=	*
 
-CONFLICTS_INSTALL=	libedit-*
-
 post-patch:
-	${REINPLACE_CMD} -e 's|-ltermcap||' ${WRKSRC}/examples/Makefile.am
+	${REINPLACE_CMD} 's|-ltermcap||' ${WRKSRC}/examples/Makefile.am
+	${REINPLACE_CMD} '/^pkgconfigdir/s|=.*|= ${PREFIX}/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile.am
+	# rename to libeditline.3 to avoid conflict with libedit
+	${REINPLACE_CMD} 's|editline.3|lib&|' ${WRKSRC}/man/Makefile.am
+	cd ${WRKSRC}/man; ${MV} editline.3 libeditline.3
 
 .include <bsd.port.mk>

Modified: head/devel/editline/distinfo
==============================================================================
--- head/devel/editline/distinfo	Tue Jun  7 05:43:06 2016	(r416495)
+++ head/devel/editline/distinfo	Tue Jun  7 06:20:44 2016	(r416496)
@@ -1,2 +1,2 @@
-SHA256 (troglobit-editline-1.15.1_GH0.tar.gz) = d8b0ba9b61cf88c09b0375a3e652e789d5e29c8c623fea9e10be1ef1323a805e
-SIZE (troglobit-editline-1.15.1_GH0.tar.gz) = 30845
+SHA256 (troglobit-editline-1.15.2_GH0.tar.gz) = d2969eabc1bfe3f25d65715a2eb782473ab6fad576ff2106b82cb87803f52b47
+SIZE (troglobit-editline-1.15.2_GH0.tar.gz) = 31623

Modified: head/devel/editline/pkg-plist
==============================================================================
--- head/devel/editline/pkg-plist	Tue Jun  7 05:43:06 2016	(r416495)
+++ head/devel/editline/pkg-plist	Tue Jun  7 06:20:44 2016	(r416496)
@@ -3,4 +3,5 @@ lib/libeditline.a
 lib/libeditline.so
 lib/libeditline.so.0
 lib/libeditline.so.0.0.0
-man/man3/editline.3.gz
+libdata/pkgconfig/libeditline.pc
+man/man3/libeditline.3.gz



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