Use SUBST framework for patching configure. Replace config.guess

and config.sub. Add DragonFly. In configure, adjust the check for
libssl, since it can't be linked without -lcrypto on DragonFly.

4 files changed, 57 insertions, 6 deletions

diff --git a/www/sope/Makefile b/www/sope/Makefile
index ba88a6187b8..fd19845e915 100644
--- a/www/sope/Makefile
+++ b/www/sope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/01/06 15:10:07 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/19 22:15:58 joerg Exp $
 #
 
 DISTNAME=		sope-4.5.4-nevermind-r878
@@ -23,11 +23,18 @@ CONFIGURE_ARGS+=	--disable-debug
 CONFIG_SHELL=		${PREFIX}/bin/bash
 MAKE_ENV+=		ADDITIONAL_OBJCFLAGS="-Wno-import"
 
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	${CONFIGURE_SCRIPT}
+SUBST_SED.paths+=	-e 's,/usr/local,${PREFIX},g'
+SUBST_STAGE.paths=	pre-configure
+
 pre-configure:
-	cd ${WRKSRC}						&&	\
-	${CP} ${CONFIGURE_SCRIPT} ${CONFIGURE_SCRIPT}.bak	&&	\
-	${SED} < ${CONFIGURE_SCRIPT}.bak > ${CONFIGURE_SCRIPT}		\
-		-e 's|/usr/local|${PREFIX}|g'
+	for f in ${WRKSRC}/*/config.guess ${WRKSRC}/*/*/config.guess; do \
+	    ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess $$f; \
+	done
+	for f in ${WRKSRC}/*/config.sub ${WRKSRC}/*/*/config.sub; do \
+	    ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub $$f; \
+	done
 
 post-configure:
 	cd ${WRKSRC}/sope-core/NGStreams			&&	\
diff --git a/www/sope/distinfo b/www/sope/distinfo
index 4a4b0e9f6c1..858d8d102cf 100644
--- a/www/sope/distinfo
+++ b/www/sope/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/08/23 05:06:04 rh Exp $
+$NetBSD: distinfo,v 1.4 2006/01/19 22:15:58 joerg Exp $
 
 SHA1 (sope-4.5.4-nevermind-r878.tar.gz) = 037cf5954380a1dec7911893a2f82f9fe8f96a18
 RMD160 (sope-4.5.4-nevermind-r878.tar.gz) = 011f73aef74dee495828b455ad85a86686644f4f
@@ -6,3 +6,5 @@ Size (sope-4.5.4-nevermind-r878.tar.gz) = 4015969 bytes
 SHA1 (patch-aa) = 5c0120114205b226ee81ccad896dd0ab79eefe68
 SHA1 (patch-ab) = 6bbb0f4008bcbc1c4d8fc06a12621f4bc013fbf7
 SHA1 (patch-ac) = 7c0ccbc3468669dea06840c6c5d6c4c9484cfe56
+SHA1 (patch-ad) = d20383bb1598a7da54a207c55c11419bda2b1494
+SHA1 (patch-ae) = 3fe2009ff4e3d1caa000afe25ba0a649b5dfaaf3
diff --git a/www/sope/patches/patch-ad b/www/sope/patches/patch-ad
new file mode 100644
index 00000000000..b970caa204b
--- /dev/null
+++ b/www/sope/patches/patch-ad
@@ -0,0 +1,29 @@
+$NetBSD: patch-ad,v 1.1 2006/01/19 22:15:58 joerg Exp $
+
+--- configure.orig	2006-01-19 21:16:02.000000000 +0000
++++ configure
+@@ -290,7 +290,7 @@ function checkLinking() {
+   echo >>$tmpmake "include \$(GNUSTEP_MAKEFILES)/common.make"
+   echo >>$tmpmake "TOOL_NAME           := linktest"
+   echo >>$tmpmake "linktest_OBJC_FILES := dummytool.m"
+-  echo >>$tmpmake "linktest_TOOL_LIBS  += -l$1"
++  echo >>$tmpmake "linktest_TOOL_LIBS  += -l$1 $3"
+   echo >>$tmpmake "SYSTEM_LIB_DIR      += ${LINK_SYSLIBDIRS}"
+   echo >>$tmpmake "include \$(GNUSTEP_MAKEFILES)/tool.make"
+   
+@@ -316,7 +316,14 @@ function checkLinking() {
+ function checkDependencies() {
+   checkLinking "xml2" required;
+   checkLinking "ldap" required;
+-  checkLinking "ssl"  required; # TODO: make optional
++  case ${OPSYS} in
++  DragonFly)
++    checkLinking "ssl"  required "-lcrypto" ; # TODO: make optional
++    ;;
++  *)
++    checkLinking "ssl"  required ; # TODO: make optional
++    ;;
++  esac
+   checkLinking "pq"   required; # TODO: make optional
+ }
+ 
diff --git a/www/sope/patches/patch-ae b/www/sope/patches/patch-ae
new file mode 100644
index 00000000000..8b5fbc0bf75
--- /dev/null
+++ b/www/sope/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/01/19 22:15:58 joerg Exp $
+
+--- sope-appserver/SoOFS/OFSHttpPasswd.m.orig	2006-01-19 21:46:08.000000000 +0000
++++ sope-appserver/SoOFS/OFSHttpPasswd.m
+@@ -23,7 +23,7 @@
+ #include <SoObjects/SoHTTPAuthenticator.h>
+ #include "common.h"
+ 
+-#if defined (__APPLE__) || defined(__FreeBSD__)
++#if defined (__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ #  include <unistd.h>
+ #else
+ #  if defined(__OpenBSD__)