From f22fd17116c32f9c6f06647858b1fdc889a1a96a Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Tue, 31 Mar 2009 21:43:47 +0000
Subject: - Make MAKE_JOBS_SAFE [1] - Set OPENSSL default

Submitted by:	danfe [1]
		 Alexander Logvinov <ports@logvinov.com> (maintainer)
---
 dns/opendd/Makefile             | 13 +++++++------
 dns/opendd/files/patch-Makefile | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)

(limited to 'dns')

diff --git a/dns/opendd/Makefile b/dns/opendd/Makefile
index dba70140fcc4..2ea229f14352 100644
--- a/dns/opendd/Makefile
+++ b/dns/opendd/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	opendd
 PORTVERSION=	0.7.9
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://www.bsdmon.com/download/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
@@ -13,10 +14,10 @@ DISTNAME=	${PORTNAME}.${PORTVERSION}
 MAINTAINER=	ports@logvinov.com
 COMMENT=	A small DynDNS client
 
-OPTIONS=	OPENDD_SSL	"Build with SSL support"	off \
-		RC_NG		"Install RC_NG script"		on
+OPTIONS=	OPENSSL	"Build with SSL support"	on \
+		RC_NG	"Install RC_NG script"		on
 
-MAKE_JOBS_UNSAFE=	yes
+MAKE_JOBS_SAFE=	yes
 PORTDOCS=	COPYING COPYRIGHT README
 PLIST_FILES=	sbin/${PORTNAME} \
 		"@unexec if cmp -s %D/%%ETCDIR%%/${PORTNAME}.conf %D/%%ETCDIR%%/${PORTNAME}.conf.default; then ${RM} -f %D/%%ETCDIR%%/${PORTNAME}.conf; fi " \
@@ -28,10 +29,10 @@ PLIST_FILES=	sbin/${PORTNAME} \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_RC_NG)
-USE_RC_SUBR=	opendd
+USE_RC_SUBR=	${PORTNAME}
 .endif
 
-.if defined(WITH_OPENDD_SSL) && !defined(WITHOUT_SSL)
+.if !defined(WITHOUT_OPENSSL)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
@@ -42,7 +43,7 @@ pre-patch:
 	@${MV} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}.${PORTVERSION}
 
 post-patch:
-.if defined(WITH_OPENDD_SSL) && !defined(WITHOUT_SSL)
+.if !defined(WITHOUT_OPENSSL)
 	@${REINPLACE_CMD} 's|use_ssl = 0|use_ssl = 1|' ${WRKSRC}/${PORTNAME}.conf
 	@${REINPLACE_CMD} -e "s|^FLAGS =|FLAGS = ${CFLAGS}|" -e "s|^SSL =|SSL = ${LDFLAGS}|" \
 	    ${WRKSRC}/Makefile
diff --git a/dns/opendd/files/patch-Makefile b/dns/opendd/files/patch-Makefile
index d88ad03a8f96..defff627faaf 100644
--- a/dns/opendd/files/patch-Makefile
+++ b/dns/opendd/files/patch-Makefile
@@ -9,3 +9,25 @@
  
  BIN_PROGRAM = opendd
  
+@@ -49,15 +49,13 @@
+ 	fi
+ 	@echo ""
+ .c.o:
+-	@echo "===>  Compiling `basename $*.o` ..."
+-	@if [ "$*" = "./include/socket" ]\
+-	|| [ "$*" = "./main" ]\
+- 	&& [ "${USE_SOCKET_SSL}" ]; then\
+-		echo '${CC} ${FLAGS} ${MACROS} -c -o $*.o $*.c';\
+-		${CC} ${FLAGS} ${MACROS} -c -o $*.o $*.c;\
++	@echo "===>  Compiling `basename $@` ..."
++	@if [ "${USE_SOCKET_SSL}" ]; then\
++		echo '${CC} ${FLAGS} ${MACROS} -c -o $@ $<';\
++		${CC} ${FLAGS} ${MACROS} -c -o $@ $<;\
+ 	else\
+-		echo '${CC} ${FLAGS} -c -o $*.o $*.c';\
+-		${CC} ${FLAGS} -c -o $*.o $*.c;\
++		echo '${CC} ${FLAGS} -c -o $@ $<';\
++		${CC} ${FLAGS} -c -o $@ $<;\
+ 	fi
+ clean:
+ 	if [ -f opendd ];then rm -f opendd; fi
-- 
cgit v1.2.3