Date: Tue, 31 Mar 2009 09:23:57 +0000 From: Alexey Dokuchaev <danfe@FreeBSD.org> To: Martin Wilke <miwi@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/dns/opendd Makefile ports/mail/heirloom-mailx Makefile Message-ID: <20090331092357.GA18017@FreeBSD.org> In-Reply-To: <200903310857.n2V8vJLg069069@repoman.freebsd.org> References: <200903310857.n2V8vJLg069069@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--pf9I7BMVVzbSWLtt
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
On Tue, Mar 31, 2009 at 08:57:19AM +0000, Martin Wilke wrote:
> miwi 2009-03-31 08:57:19 UTC
>
> FreeBSD ports repository
>
> Modified files:
> dns/opendd Makefile
> mail/heirloom-mailx Makefile
> Log:
> - Make MAKE_JOBS_UNSAFE
Or, one could spent ten minutes to investigate and come up with the
patch (see attachment). ;-)
Alexander, I also wonder why SSL knob is called OPENDD_SSL when we have
standard SSL knob in KNOBS, and why it is off by default when we have
OpenSSL in base and thus it costs nothing in term of extra dependencies.
Thanks.
--pf9I7BMVVzbSWLtt
Content-Type: text/plain; charset=koi8-r
Content-Disposition: attachment; filename=diff2
Index: Makefile
===================================================================
RCS file: /mnt/fbsd/development/FreeBSD-CVS/ports/dns/opendd/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 31 Mar 2009 08:57:19 -0000 1.4
+++ Makefile 31 Mar 2009 09:06:38 -0000
@@ -16,7 +16,7 @@
OPTIONS= OPENDD_SSL "Build with SSL support" off \
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 " \
Index: files/patch-Makefile
===================================================================
RCS file: /mnt/fbsd/development/FreeBSD-CVS/ports/dns/opendd/files/patch-Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile
--- files/patch-Makefile 15 Nov 2006 21:23:52 -0000 1.1
+++ files/patch-Makefile 31 Mar 2009 09:15:01 -0000
@@ -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
--pf9I7BMVVzbSWLtt--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090331092357.GA18017>