Index: bsd.gnustep.mk
===================================================================
RCS file: bsd.gnustep.mk
diff -N bsd.gnustep.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ bsd.gnustep.mk	31 Mar 2003 11:50:33 -0000
@@ -0,0 +1,185 @@
+#
+# $FreeBSD$
+#
+# This file contains some variable definitions that are supposed to
+# make your life easier when dealing with ports related to the GNUstep.
+#
+#
+# Options for user to customize in /etc/make.conf:
+# ================================================
+#
+# WANT_GNUSTEP_XDPS=yes
+#	use xdps as backend instead of xlib.
+#
+# WANT_GNUSTEP_LIBART=yes
+#	use libart as backend instead of xlib.
+#
+#
+# Options for a port before include this file:
+# ============================================
+#
+# USE_GNUSTEP_BASE=yes
+#	your port depends on the gnustep-base port.
+#
+# USE_GNUSTEP_GUI=yes
+#	your port depends on the gnustep-gui port.
+#
+# USE_GNUSTEP_BACK=yes
+#	your port depends on teh gnustep-back port.
+#
+# USE_GNUSTEP_CONFIGURE=yes
+#	call configure script with GNUstep.sh sourced in the current shell
+#
+# USE_GNUSTEP_BUILD=yes
+#	call build target with GNUstep.sh sourced in the current shell
+#
+# USE_GNUSTEP_INSTALL=yes
+#	call install target with GNUstep.sh sourced in the current shell
+# 
+
+# ---------------------------------------------------------------------------
+.if !defined(_POSTMKINCLUDED)
+
+GNUstep_Include_MAINTAINER=	dinoex@FreeBSD.org
+
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall
+LIB_DEPENDS+=	objc:${PORTSDIR}/${GNUSTEP_OBJC_PORT}
+
+GNUSTEP_MAKE_PORT?=	devel/gnustep-make
+GNUSTEP_OBJC_PORT?=	lang/gnustep-objc
+GNUSTEP_BASE_PORT?=	lang/gnustep-base
+GNUSTEP_GUI_PORT?=	x11-toolkits/gnustep-gui
+GNUSTEP_BACK_PORT?=	x11-toolkits/gnustep-back
+GNUSTEP_XDPS_PORT?=	x11-toolkits/gnustep-xdps
+GNUSTEP_ART_PORT?=	x11-toolkits/gnustep-art
+
+.if ${MACHINE_ARCH} == "i386"
+GNU_ARCH=	ix86
+.else
+GNU_ARCH=	${MACHINE_ARCH}
+.endif
+
+PLIST_SUB+=	GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION}
+PLIST_SUB+=	MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1}
+
+SYSTEMDIR=	${PREFIX}/System
+SYSMAKEDIR=	${SYSTEMDIR}/Makefiles
+SYSLIBDIR=	${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}
+COMBOLIBDIR=	${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
+BUNDLEDIR=	${SYSTEMDIR}/Library/Bundles
+COMBOPATH=	${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
+LOCALLIBDIR=	${PREFIX}/Local/Libraries/${COMBOPATH}
+CC=		gcc32
+CXX=		g++32
+
+# ---------------------------------------------------------------------------
+# using base
+#
+.if defined(USE_GNUSTEP_BASE)
+BUILD_DEPENDS+=	${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT}
+RUN_DEPENDS+=	${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT}
+.endif
+
+# ---------------------------------------------------------------------------
+# using gui
+#
+.if defined(USE_GNUSTEP_GUI)
+BUILD_DEPENDS+=	${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/${GNUSTEP_GUI_PORT}
+RUN_DEPENDS+=	${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/${GNUSTEP_GUI_PORT}
+.endif
+
+# ---------------------------------------------------------------------------
+# using any backend
+#
+.if defined(USE_GNUSTEP_BACK)
+.if defined(WANT_GNUSTEP_XDPS)
+GNUSTEP_WITH_XDPS=yes
+.else
+.if defined(WANT_GNUSTEP_LIBART)
+USE_GNUSTEP_LIBART=yes
+.else
+USE_GNUSTEP_XLIB=yes
+.endif
+.endif
+.endif
+
+# ---------------------------------------------------------------------------
+# Backend using xlib
+#
+.if defined(USE_GNUSTEP_XLIB)
+BUILD_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
+RUN_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
+
+BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-back.bundle/${COMBOPATH}
+MAKE_FLAGS+=	GUI_BACKEND_LIB=back
+.endif
+
+# ---------------------------------------------------------------------------
+# Backend using xdps
+#
+.if defined(USE_GNUSTEP_XDPS)
+BUILD_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
+RUN_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
+
+BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-xdps.bundle/${COMBOPATH}
+MAKE_FLAGS+=	GUI_BACKEND_LIB=xdps
+.endif
+
+# ---------------------------------------------------------------------------
+# Backend using libart
+#
+.if defined(USE_GNUSTEP_LIBART)
+BUILD_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
+RUN_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
+
+BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-art.bundle/${COMBOPATH}
+MAKE_FLAGS+=	GUI_BACKEND_LIB=art
+.endif
+
+# ---------------------------------------------------------------------------
+# source GNUstep.sh
+#
+.if defined(USE_GNUSTEP_CONFIGURE)
+do-configure:
+	@(cd ${CONFIGURE_WRKSRC}; . ${SYSMAKEDIR}/GNUstep.sh; \
+	    if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
+		INSTALL_DATA="${INSTALL} -c" \
+		INSTALL_PROGRAM="${INSTALL} -c" \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
+		    ${ECHO} "===>  Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \
+		    ${CAT} ${CONFIGURE_LOG}; \
+		    ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \
+		    ${FALSE}; \
+	    fi)
+.endif
+
+# ---------------------------------------------------------------------------
+# source GNUstep.sh
+#
+.if defined(USE_GNUSTEP_BUILD)
+BUILD_DEPENDS+=	${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT}
+
+do-build:
+	@(cd ${WRKSRC}; . ${SYSMAKEDIR}/GNUstep.sh; \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
+
+.endif
+
+# ---------------------------------------------------------------------------
+# source GNUstep.sh
+#
+.if defined(USE_GNUSTEP_INSTALL)
+RUN_DEPENDS+=	${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT}
+
+do-install:
+	@(cd ${WRKSRC}; . ${SYSMAKEDIR}/GNUstep.sh; \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+
+.endif
+
+.endif
+
+# eof
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.444
diff -u -r1.444 bsd.port.mk
--- bsd.port.mk	22 Mar 2003 04:45:24 -0000	1.444
+++ bsd.port.mk	31 Mar 2003 11:50:49 -0000
@@ -927,45 +927,7 @@
 .endif # !defined(PERL_LEVEL) && defined(PERL_VERSION)
 
 .if defined(USE_OPENSSL)
-.if ${OSVERSION} >= 400014
-.if !exists(/usr/lib/libcrypto.so)
-.BEGIN:
-	@${ECHO_CMD} "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}
-.else
-OPENSSLBASE=	/usr
-OPENSSLDIR=		/etc/ssl
-# 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
-.endif
-.else
-LIB_DEPENDS+=	crypto.2:${PORTSDIR}/security/openssl
-OPENSSLBASE?=	${LOCALBASE}
-OPENSSLDIR?=	${OPENSSLBASE}/openssl
-.endif
-OPENSSLLIB=		${OPENSSLBASE}/lib
-OPENSSLINC=		${OPENSSLBASE}/include
-MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
-				OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR}
+.include "${PORTSDIR}/security/openssl/Makefile.ssl"
 .endif
 
 .if defined(EMACS_PORT_NAME)
@@ -3496,7 +3458,7 @@
 			else \
 				if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \
 					subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \
-					if [ -r "$${subpkgfile}" ]; then \
+					if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \
 						${ECHO_MSG} "===>   Installing existing package $${subpkgfile}"; \
 						${PKG_ADD} $${subpkgfile}; \
 					else \
@@ -3550,7 +3512,17 @@
 			if [ ! -d "$$dir" ]; then \
 				${ECHO_MSG} "     >> No directory for $$lib.  Skipping.."; \
 			else \
-				(cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
+				if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \
+					subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \
+					if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \
+						${ECHO_MSG} "===>   Installing existing package $${subpkgfile}"; \
+						${PKG_ADD} $${subpkgfile}; \
+					else \
+					  (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
+					fi; \
+				else \
+					(cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
+				fi ; \
 				${ECHO_MSG} "===>   Returning to build of ${PKGNAME}"; \
 				if ! ${LDCONFIG} -r | ${GREP} -qwE -e "-l$$pattern"; then \
 					${ECHO_MSG} "Error: shared library \"$$lib\" does not exist"; \