[Midnightbsd-cvs] mports [23323] trunk/Mk/extensions/ncurses.mk: move the rpath stuff

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed May 2 22:36:58 EDT 2018


Revision: 23323
          http://svnweb.midnightbsd.org/mports/?rev=23323
Author:   laffer1
Date:     2018-05-02 22:36:57 -0400 (Wed, 02 May 2018)
Log Message:
-----------
move the rpath stuff

Modified Paths:
--------------
    trunk/Mk/extensions/ncurses.mk

Modified: trunk/Mk/extensions/ncurses.mk
===================================================================
--- trunk/Mk/extensions/ncurses.mk	2018-05-03 01:50:12 UTC (rev 23322)
+++ trunk/Mk/extensions/ncurses.mk	2018-05-03 02:36:57 UTC (rev 23323)
@@ -60,10 +60,15 @@
 NCURSES_PORT?=		devel/ncurses
 NCURSES_SHLIBVER?=	5
 
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${PORTSDIR}/${NCURSES_PORT}
-RUN_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${PORTSDIR}/${NCURSES_PORT}
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
+RUN_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
 NCURSESRPATH=		${NCURSESBASE}/lib
 
+.if defined(NCURSES_RPATH)
+CFLAGS+=	-Wl,-rpath,${NCURSESRPATH}
+.endif
+LDFLAGS+=	-Wl,-rpath=${NCURSESRPATH}
+
 .else
 .error		USES=ncurses only accept 'port' and 'base' as arguments, got ${ncurses_ARGS}
 .endif
@@ -70,9 +75,4 @@
 
 NCURSESLIB=	${NCURSESBASE}/lib
 
-.if defined(NCURSES_RPATH)
-CFLAGS+=	-Wl,-rpath,${NCURSESRPATH}
 .endif
-LDFLAGS+=	-Wl,-rpath=${NCURSESRPATH}
-
-.endif



More information about the Midnightbsd-cvs mailing list