Index: head/Mk/bsd.ncurses.mk
===================================================================
--- head/Mk/bsd.ncurses.mk	(revision 295005)
+++ head/Mk/bsd.ncurses.mk	(revision 295006)
@@ -1,96 +1,112 @@
+# $FreeBSD$
+#
 # the user/port can now set this options in the makefiles.
 #
 # WITH_NCURSES_BASE=yes	- Use the version in the base system.
 # WITH_NCURSES_PORT=yes	- Use the port, even if base is up to date
 #
 # USE_NCURSES_RPATH=yes	- Pass RFLAGS options in CFLAGS,
 #			  needed for ports who don't use LDFLAGS
 #
 # Overrideable defaults:
 #
 # NCURSES_SHLIBVER=	5
 # NCURSES_PORT=		devel/ncurses
 #
 # The makefile sets this variables:
 # NCURSESBASE		- "/usr" or ${LOCALBASE}
 # NCURSESLIB		- path to the libs
 # NCURSESINC		- path to the matching includes
 # NCURSESRPATH		- rpath for dynamic linker
 #
 # MAKE_ENV		- extended with the variables above
 # CONFIGURE_ENV		- extended with LDFLAGS
 # BUILD_DEPENDS		- are added if needed
 # RUN_DEPENDS		- are added if needed
 
 #	if no preference was set, check for an installed base version
 #	but give an installed port preference over it.
 .if	!defined(WITH_NCURSES_BASE) && \
 	!defined(WITH_NCURSES_PORT) && \
 	!exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so) && \
 	exists(${DESTDIR}/usr/include/ncurses.h)
 WITH_NCURSES_BASE=yes
 .endif
 
 .if defined(WITH_NCURSES_BASE)
 NCURSESBASE=		/usr
 NCURSESINC=		${NCURSESBASE}/include
 
 .if exists(${LOCALBASE}/lib/libncurses.so)
 check-depends::
 	@${ECHO_CMD} "Dependency error: this port wants the ncurses library from the FreeBSD"
 	@${ECHO_CMD} "base system. You can't build against it, while a newer"
 	@${ECHO_CMD} "version is installed by a port."
 	@${ECHO_CMD} "Please deinstall the port or undefine WITH_NCURSES_BASE."
 	@${FALSE}
 .endif
 
 NCURSESRPATH=		/usr/lib:${LOCALBASE}/lib
 
 .else
 
 NCURSESBASE=		${LOCALBASE}
 NCURSESINC=		${NCURSESBASE}/include/ncurses
 .if	!defined(NCURSES_PORT) && \
 	exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so)
 # find installed port and use it for dependency
 PKG_DBDIR?=		${DESTDIR}/var/db/pkg
 .if !defined(NCURSES_INSTALLED)
+.if defined(WITH_PKGNG)
+.if defined(DESTDIR)
+PKGARGS=	-c ${DESTDIR}
+.else
+PKGARGS=
+.endif
+NCURSES_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libncurses.so
+.else
 NCURSES_INSTALLED!=	find "${PKG_DBDIR}/" -type f -name "+CONTENTS" -print0 | \
 			xargs -0 grep -l "^lib/libncurses.so." | \
 			while read contents; do \
 				ncursesprefix=`grep "^@cwd " "$${contents}" | ${HEAD} -n 1`; \
 				if test "$${ncursesprefix}" = "@cwd ${LOCALBASE}" ; then \
 					echo "$${contents}"; break; fi; done
 .endif
+.endif
 .if defined(NCURSES_INSTALLED) && ${NCURSES_INSTALLED} != ""
+.if defined(WITH_PKGNG)
+NCURSES_PORT=		${NCURSES_INSTALLED}
+NCURSES_SHLIBFILE!=	${PKG_INFO} -ql ${OPENSSL_INSTALLED} | grep "^`pkg query "%p" ${OPENSSL_INSTALLED}`/lib/libncurses.so."
+.else
 NCURSES_PORT!=		grep "^@comment ORIGIN:" "${NCURSES_INSTALLED}" | ${CUT} -d : -f 2
 NCURSES_SHLIBFILE!=	grep -m 1 "^lib/libncurses.so." "${NCURSES_INSTALLED}"
+.endif
 NCURSES_SHLIBVER?=	${NCURSES_SHLIBFILE:E}
 .else
 # PKG_DBDIR was not found, default
 NCURSES_PORT?=		devel/ncurses
 NCURSES_SHLIBVER?=	5
 .endif
 .endif
 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}
 NCURSESRPATH=		${LOCALBASE}/lib
 
 .endif
 
 NCURSESLIB=		${NCURSESBASE}/lib
 
 .if defined(USE_NCURSES_RPATH)
 CFLAGS+=		-Wl,-rpath,${NCURSESRPATH}
 .endif
 NCURSES_LDFLAGS+=	-rpath=${NCURSESRPATH}
 
 .if defined(LDFLAGS)
 LDFLAGS+=${NCURSES_LDFLAGS}
 .else
 LDFLAGS+=${NCURSES_LDFLAGS}
 .endif
 

Property changes on: head/Mk/bsd.ncurses.mk
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/Mk/bsd.openssl.mk
===================================================================
--- head/Mk/bsd.openssl.mk	(revision 295005)
+++ head/Mk/bsd.openssl.mk	(revision 295006)
@@ -1,145 +1,159 @@
 # makefile for use of:	OpenSSH
 # Date created:		31 May 2002
 # Whom:			dinoex
 #
-# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.47 2012-04-15 07:31:52 dinoex Exp $
+# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.48 2012-04-18 11:38:20 bapt Exp $
 #
 # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
 #
 # the user/port can now set this options in the makefiles.
 #
 # WITH_OPENSSL_BASE=yes	- Use the version in the base system.
 # WITH_OPENSSL_PORT=yes	- Use the port, even if base is up to date
 #
 # USE_OPENSSL_RPATH=yes	- Pass RFLAGS options in CFLAGS,
 #			  needed for ports who don't use LDFLAGS
 #
 # Overrideable defaults:
 #
 # OPENSSL_SHLIBVER=	3
 # OPENSSL_PORT=		security/openssl
 #
 # The makefile sets this variables:
 # OPENSSLBASE		- "/usr" or ${LOCALBASE}
 # OPENSSLDIR		- path to openssl
 # OPENSSLLIB		- path to the libs
 # OPENSSLINC		- path to the matching includes
 # OPENSSLRPATH		- rpath for dynamic linker
 #
 # MAKE_ENV		- extended with the variables above
 # CONFIGURE_ENV		- extended with LDFLAGS
 # BUILD_DEPENDS		- are added if needed
 # RUN_DEPENDS		- are added if needed
 
 OpenSSL_Include_MAINTAINER=	dinoex@FreeBSD.org
 
 # honor obsolete options for a bit
 .if defined(USE_OPENSSL_BASE) && !defined(WITH_OPENSSL_BASE)
 WITH_OPENSSL_BASE=yes
 .endif
 .if defined(USE_OPENSSL_PORT) && !defined(WITH_OPENSSL_PORT)
 WITH_OPENSSL_PORT=yes
 .endif
 
 #	if no preference was set, check for an installed base version
 #	but give an installed port preference over it.
 .if	!defined(WITH_OPENSSL_BASE) && \
 	!defined(WITH_OPENSSL_PORT) && \
 	!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
 	exists(${DESTDIR}/usr/include/openssl/opensslv.h)
 WITH_OPENSSL_BASE=yes
 .endif
 
 .if defined(WITH_OPENSSL_BASE)
 OPENSSLBASE=		/usr
 OPENSSLDIR=		/etc/ssl
 
 .if !exists(${DESTDIR}/usr/lib/libcrypto.so)
 check-depends::
 	@${ECHO_CMD} "Dependency error: this port requires the OpenSSL library, which is part of"
 	@${ECHO_CMD} "the FreeBSD crypto distribution but not installed on your"
 	@${ECHO_CMD} "machine. Please see the \"OpenSSL\" section in the handbook"
 	@${ECHO_CMD} "(at \"http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/openssl.html\", for instance)"
 	@${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD"
 	@${ECHO_CMD} "OpenSSL distribution."
 	@${FALSE}
 .endif
 .if exists(${LOCALBASE}/lib/libcrypto.so)
 check-depends::
 	@${ECHO_CMD} "Dependency error: this port wants the OpenSSL library from the FreeBSD"
 	@${ECHO_CMD} "base system. You can't build against it, while a newer"
 	@${ECHO_CMD} "version is installed by a port."
 	@${ECHO_CMD} "Please deinstall the port or undefine WITH_OPENSSL_BASE."
 	@${FALSE}
 .endif
 
 # OpenSSL in the base system may not include IDEA for patent licensing reasons.
 .if defined(MAKE_IDEA) && !defined(OPENSSL_IDEA)
 OPENSSL_IDEA=		${MAKE_IDEA}
 .else
 OPENSSL_IDEA?=		NO
 .endif
 
 .if ${OPENSSL_IDEA} == "NO"
 # XXX This is a hack to work around the fact that /etc/make.conf clobbers
 #     our CFLAGS. It might not be enough for all future ports.
 .if defined(HAS_CONFIGURE)
 CFLAGS+=		-DNO_IDEA
 .else
 OPENSSL_CFLAGS+=	-DNO_IDEA
 .endif
 MAKE_ARGS+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
 .endif
 OPENSSLRPATH=		/usr/lib:${LOCALBASE}/lib
 
 .else
 
 OPENSSLBASE=		${LOCALBASE}
 .if	!defined(OPENSSL_PORT) && \
 	exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
 # find installed port and use it for dependency
 PKG_DBDIR?=		${DESTDIR}/var/db/pkg
 .if !defined(OPENSSL_INSTALLED)
+.if defined(WITH_PKGNG)
+.if defined(DESTDIR)
+PKGARGS=	-c ${DESTDIR}
+.else
+PKGARGS=
+.endif
+OPENSSL_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so
+.else
 OPENSSL_INSTALLED!=	find "${PKG_DBDIR}/" -type f -name "+CONTENTS" -print0 | \
 			xargs -0 grep -l "^lib/libssl.so." | \
 			while read contents; do \
 				sslprefix=`grep "^@cwd " "$${contents}" | ${HEAD} -n 1`; \
 				if test "$${sslprefix}" = "@cwd ${LOCALBASE}" ; then \
 					echo "$${contents}"; break; fi; done
 .endif
+.endif
 .if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != ""
+.if defined(WITH_PKGNG)
+OPENSSL_PORT=		${OPENSSL_INSTALLED}
+OPENSSL_SHLIBFILE!=	${PKG_INFO} -ql ${OPENSSL_INSTALLED} | grep "^`pkg query "%p" ${OPENSSL_INSTALLED}`/lib/libssl.so."
+.else
 OPENSSL_PORT!=		grep "^@comment ORIGIN:" "${OPENSSL_INSTALLED}" | ${CUT} -d : -f 2
 OPENSSL_SHLIBFILE!=	grep "^lib/libssl.so." "${OPENSSL_INSTALLED}"
+.endif
 OPENSSL_SHLIBVER?=	${OPENSSL_SHLIBFILE:E}
 .else
 # PKG_DBDIR was not found, default
 OPENSSL_PORT?=		security/openssl
 OPENSSL_SHLIBVER?=	8
 .endif
 .endif
 OPENSSL_PORT?=		security/openssl
 OPENSSL_SHLIBVER?=	8
 
 OPENSSLDIR=		${OPENSSLBASE}/openssl
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${PORTSDIR}/${OPENSSL_PORT}
 RUN_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${PORTSDIR}/${OPENSSL_PORT}
 OPENSSLRPATH=		${LOCALBASE}/lib
 
 .endif
 
 OPENSSLLIB=		${OPENSSLBASE}/lib
 OPENSSLINC=		${OPENSSLBASE}/include
 
 .if defined(USE_OPENSSL_RPATH)
 CFLAGS+=		-Wl,-rpath,${OPENSSLRPATH}
 .endif
 OPENSSL_LDFLAGS+=	-rpath=${OPENSSLRPATH}
 
 LDFLAGS+=${OPENSSL_LDFLAGS}
 
 MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
 			OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR}
 
 ### crypto
 #RESTRICTED=		"Contains cryptography."
 

Property changes on: head/Mk/bsd.openssl.mk
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property