svn commit: r424449 - in head/devel/ncurses: . files
Kubilay Kocak
koobs at FreeBSD.org
Sat Oct 22 07:05:57 UTC 2016
Author: koobs
Date: Sat Oct 22 07:05:55 2016
New Revision: 424449
URL: https://svnweb.freebsd.org/changeset/ports/424449
Log:
devel/ncurses: Fix pkg-config file for linking
- Backport upstream patch from 20160220 [1]:
modify configure macro for shared-library rules to use -Wl,-rpath
rather than -rpath to work around a bug in scons (FreeBSD #178732 [2],
cf: 20061021).
While I'm here:
- Remove unecessary CONFLICTS (on deleted port)
- Add LICENSE_FILE
- Tab -> space in pkg-descr: WWW URL
[1] http://lists.gnu.org/archive/html/bug-ncurses/2016-02/msg00009.html
[2] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=178732
PR: 209526
Submitted by: John Hein <z7dr6ut7gs snkmail com>
MFH: 2016Q4
Added:
head/devel/ncurses/files/
head/devel/ncurses/files/patch-configure (contents, props changed)
Modified:
head/devel/ncurses/Makefile
head/devel/ncurses/pkg-descr
Modified: head/devel/ncurses/Makefile
==============================================================================
--- head/devel/ncurses/Makefile Sat Oct 22 06:08:54 2016 (r424448)
+++ head/devel/ncurses/Makefile Sat Oct 22 07:05:55 2016 (r424449)
@@ -3,7 +3,7 @@
PORTNAME= ncurses
PORTVERSION= 6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://invisible-mirror.net/archives/${PORTNAME}/ \
ftp://invisible-island.net/${PORTNAME}/
@@ -12,9 +12,8 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ports at FreeBSD.org
COMMENT= Library for terminal-independent, full-screen output
-CONFLICTS= ncurses-devel-*
-
LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_sparc64= cannot build: coredump: illegal instruction
@@ -33,6 +32,7 @@ CONFIGURE_ARGS= --datadir=${PREFIX}/shar
--mandir=${MANPREFIX}/man \
--with-hashed-db \
--with-pkg-config-libdir=${PREFIX}/libdata/pkgconfig
+
MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= TRACE DEBUG PROFILE EXAMPLES DOCS
Added: head/devel/ncurses/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ncurses/files/patch-configure Sat Oct 22 07:05:55 2016 (r424449)
@@ -0,0 +1,24 @@
+# Based on upstream 6.0 patch 20160220:
+#
+# + modify configure macro for shared-library rules to use -Wl,-rpath
+# rather than -rpath to work around a bug in scons (FreeBSD #178732,
+# cf: 20061021).
+#
+# See Also:
+#
+# http://lists.gnu.org/archive/html/bug-ncurses/2016-02/msg00009.html
+# http://lists.gnu.org/archive/html/bug-ncurses/2016-02/msg00006.html
+#
+# TODO: Remove patch on 6.1 update
+
+--- configure.orig 2015-08-05 09:20:32 UTC
++++ configure
+@@ -5863,7 +5863,7 @@ case $cf_cv_system_name in
+ LD_RPATH_OPT="-Wl,-rpath,"
+ ;;
+ (dragonfly*|freebsd*)
+- LD_RPATH_OPT="-rpath "
++ LD_RPATH_OPT="-Wl,-rpath,"
+ ;;
+ (netbsd*)
+ LD_RPATH_OPT="-Wl,-rpath,"
Modified: head/devel/ncurses/pkg-descr
==============================================================================
--- head/devel/ncurses/pkg-descr Sat Oct 22 06:08:54 2016 (r424448)
+++ head/devel/ncurses/pkg-descr Sat Oct 22 07:05:55 2016 (r424449)
@@ -10,4 +10,4 @@ be configured to use BSD's /etc/termcap
been approved by the old 4.4BSD curses maintainer as the official
4.4BSD curses successor.
-WWW: http://invisible-island.net/ncurses/ncurses.html
+WWW: http://invisible-island.net/ncurses/ncurses.html
More information about the svn-ports-head
mailing list