diff options
Diffstat (limited to 'parallel/sge')
| -rw-r--r-- | parallel/sge/Makefile | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile index 1d712bb1de4..1ac70640b9c 100644 --- a/parallel/sge/Makefile +++ b/parallel/sge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2015/06/12 10:50:55 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2015/11/25 12:52:27 jperkin Exp $ # DISTNAME= sge-8.1.6 @@ -32,8 +32,6 @@ PKG_GECOS.${SGE_USER}= Sun Grid Engine Administrator PKG_GROUPS_VARS+= SGE_GROUP PKG_USERS_VARS+= SGE_USER -EVAL_PREFIX+= PKGSRC_SSL_PREFIX=openssl - AIMK= ${SETENV} ${MAKE_ENV} ${CSH} -fb ${WRKSRC}/source/aimk CONFIG_GUESS_OVERRIDE= source/3rdparty/qmake/config.guess \ @@ -116,12 +114,12 @@ post-patch: ${ECHO} " `${WRKSRC}/source/dist/util/arch`" ; \ ${FALSE} ; \ fi - ( ${ECHO} "set OPENSSL_HOME = ${SSL_PREFIX}" ; \ + ( ${ECHO} "set OPENSSL_HOME = ${BUILDLINK_PREFIX.openssl}" ; \ ${ECHO} "set BERKELEYDB_HOME = ${BUILDLINK_PREFIX.db4}" ; \ ${ECHO} "set BDB_INCLUDE_SUBDIR = db4" ; \ ${ECHO} "set BDB_LIB_SUFFIX = 4" ; \ ${ECHO} "set PERL = ${PERL5}" ) > ${WRKSRC}/source/aimk.private - ( ${ECHO} "OPENSSLBASE=${SSL_PREFIX}" ; \ + ( ${ECHO} "OPENSSLBASE=${BUILDLINK_PREFIX.openssl}" ; \ ${ECHO} "BERKELEYDBBASE=${BUILDLINK_PREFIX.db4}" ) > ${WRKSRC}/source/distinst.private rm ${WRKSRC}/source/dist/util/*.orig @@ -168,7 +166,7 @@ do-install: for f in archive checkpoint deadlock dump load printlog recover stat upgrade verify ; do \ ln -s ${LOCALBASE}/bin/db4_$${f} ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/db_$${f} ; done ln -s ${LOCALBASE}/bin/berkeley_db4_svc ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/berkeley_db_svc - ln -s ${SSL_PREFIX}/bin/openssl ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/openssl + ln -s ${BUILDLINK_PREFIX.openssl}/bin/openssl ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/openssl cd ${DESTDIR}${SGE_ROOT} && ${SETENV} SGE_ROOT=${SGE_ROOT} DESTDIR=${DESTDIR} ./util/setfileperm.sh -auto \ ${SGE_ROOT} for f in ${DESTDIR}${SGE_ROOT}/bin/${SGE_ARCH}/q* ; do \ @@ -186,8 +184,3 @@ PLIST_SUBST+= SGE_ARCH=${SGE_ARCH} .include "../../mk/motif.buildlink3.mk" .include "../../mk/pam.buildlink3.mk" .include "../../mk/bsd.pkg.mk" -.if ${USE_BUILTIN.openssl} == "yes" -SSL_PREFIX= /usr -.else -SSL_PREFIX= ${PKGSRC_SSL_PREFIX} -.endif |