From owner-svn-ports-all@freebsd.org Mon Feb 1 23:47:53 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41FFEA97EE5; Mon, 1 Feb 2016 23:47:53 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 03E9F8FE; Mon, 1 Feb 2016 23:47:52 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u11NlqMH076209; Mon, 1 Feb 2016 23:47:52 GMT (envelope-from acm@FreeBSD.org) Received: (from acm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u11NlpEv076205; Mon, 1 Feb 2016 23:47:51 GMT (envelope-from acm@FreeBSD.org) Message-Id: <201602012347.u11NlpEv076205@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: acm set sender to acm@FreeBSD.org using -f From: Jose Alonso Cardenas Marquez Date: Mon, 1 Feb 2016 23:47:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407785 - in head/sysutils: bareos-client bareos-client-static bareos-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Feb 2016 23:47:53 -0000 Author: acm Date: Mon Feb 1 23:47:51 2016 New Revision: 407785 URL: https://svnweb.freebsd.org/changeset/ports/407785 Log: - Fix build of sysutils/bareos-client-static - Add additional jamsson support path files - Bump PORTREVISION Added: head/sysutils/bareos-server/files/patch-src-console-Makefile.in (contents, props changed) Modified: head/sysutils/bareos-client-static/Makefile head/sysutils/bareos-client/Makefile head/sysutils/bareos-server/files/patch-src-filed-Makefile.in Modified: head/sysutils/bareos-client-static/Makefile ============================================================================== --- head/sysutils/bareos-client-static/Makefile Mon Feb 1 23:07:16 2016 (r407784) +++ head/sysutils/bareos-client-static/Makefile Mon Feb 1 23:47:51 2016 (r407785) @@ -22,6 +22,8 @@ CONFIGURE_ARGS+= --enable-client-only \ --enable-static-cons \ --disable-libtool \ --disable-build-dird \ - --disable-build-stored + --disable-build-stored \ + --with-jansson=${LOCALBASE} + .include "${MASTERDIR}/Makefile" Modified: head/sysutils/bareos-client/Makefile ============================================================================== --- head/sysutils/bareos-client/Makefile Mon Feb 1 23:07:16 2016 (r407784) +++ head/sysutils/bareos-client/Makefile Mon Feb 1 23:47:51 2016 (r407785) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bareos -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) Added: head/sysutils/bareos-server/files/patch-src-console-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bareos-server/files/patch-src-console-Makefile.in Mon Feb 1 23:47:51 2016 (r407785) @@ -0,0 +1,25 @@ +--- src/console/Makefile.in 2015-12-03 03:22:54.000000000 -0500 ++++ src/console/Makefile.in 2016-02-01 18:21:25.511282000 -0500 +@@ -29,6 +29,7 @@ + CONS_LDFLAGS = @CONS_LDFLAGS@ + + JANSSON_CPPFLAGS = @JANSSON_INC@ ++JANSSON_LDFLAGS = @JANSSON_LIBS@ + + INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include + +@@ -52,12 +53,12 @@ + bconsole: Makefile $(CONSOBJS) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ + $(DLIB) $(CONS_LIBS) -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS) + + static-bconsole: Makefile $(CONSOBJS) ../lib/libbareos.a ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ + $(DLIB) $(CONS_LIBS) -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) $(GNUTLS_LIBS) ++ $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS) + strip $@ + + Modified: head/sysutils/bareos-server/files/patch-src-filed-Makefile.in ============================================================================== --- head/sysutils/bareos-server/files/patch-src-filed-Makefile.in Mon Feb 1 23:07:16 2016 (r407784) +++ head/sysutils/bareos-server/files/patch-src-filed-Makefile.in Mon Feb 1 23:47:51 2016 (r407785) @@ -1,11 +1,30 @@ ---- src/filed/Makefile.in 2015-08-08 14:17:28.058350000 -0500 -+++ src/filed/Makefile.in 2015-08-08 14:17:49.001877000 -0500 -@@ -84,7 +84,7 @@ +--- src/filed/Makefile.in 2015-12-03 03:22:54.000000000 -0500 ++++ src/filed/Makefile.in 2016-02-01 18:17:25.879376000 -0500 +@@ -25,6 +25,7 @@ + GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@ + + JANSSON_CPPFLAGS = @JANSSON_INC@ ++JANSSON_LDFLAGS = @JANSSON_LIBS@ + COMPRESS_CPPFLAGS += @ZLIB_INC@ @LZO_INC@ @FASTLZ_INC@ + + first_rule: all +@@ -76,7 +77,7 @@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ + $(FDLIBS) -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS) + + static-bareos-fd: Makefile $(SVROBJS) \ + ../findlib/libbareosfind.a \ +@@ -84,8 +85,8 @@ ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ - $(FDLIBS) -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) + -lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \ - $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS) strip $@ + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status