[Midnightbsd-cvs] mports [23508] trunk/Mk/components/default-versions.mk: fix some issues with detection

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat May 12 10:05:31 EDT 2018


Revision: 23508
          http://svnweb.midnightbsd.org/mports/?rev=23508
Author:   laffer1
Date:     2018-05-12 10:05:30 -0400 (Sat, 12 May 2018)
Log Message:
-----------
fix some issues with detection

Modified Paths:
--------------
    trunk/Mk/components/default-versions.mk

Modified: trunk/Mk/components/default-versions.mk
===================================================================
--- trunk/Mk/components/default-versions.mk	2018-05-12 13:50:58 UTC (rev 23507)
+++ trunk/Mk/components/default-versions.mk	2018-05-12 14:05:30 UTC (rev 23508)
@@ -11,6 +11,9 @@
 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK)
 _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
 
+LOCALBASE?=	/usr/local
+MPORT_CMD?=	/usr/sbin/mport
+
 .for lang in APACHE BDB EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT LINUX LUA \
 	MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK
 .if defined(${lang}_DEFAULT)
@@ -57,19 +60,14 @@
 #	If no preference was set, check for an installed base version
 #	but give an installed port preference over it.
 .  if	!defined(SSL_DEFAULT) && \
-	!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
-	exists(${DESTDIR}/usr/include/openssl/opensslv.h)
+	!exists(${LOCALBASE}/lib/libcrypto.so) && \
+	exists(/usr/include/openssl/opensslv.h)
 SSL_DEFAULT=	base
 .  else
-.    if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
+.    if exists(${LOCALBASE}/lib/libcrypto.so)
 .      if defined(MPORT_CMD)
 # find installed port and use it for dependency
 .        if !defined(OPENSSL_INSTALLED)
-.          if defined(DESTDIR)
-PKGARGS=	-c ${DESTDIR}
-.          else
-PKGARGS=
-.          endif
 OPENSSL_INSTALLED!=	${MPORT_CMD} which -qo ${LOCALBASE}/lib/libcrypto.so || :
 .        endif
 .        if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED)



More information about the Midnightbsd-cvs mailing list