svn commit: r407785 - in head/sysutils: bareos-client bareos-client-static bareos-server/files
Jose Alonso Cardenas Marquez
acm at FreeBSD.org
Mon Feb 1 23:47:53 UTC 2016
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
More information about the svn-ports-all
mailing list