From owner-svn-ports-head@freebsd.org Wed Nov 16 19:41:41 2016 Return-Path: Delivered-To: svn-ports-head@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 9F60EC44E6B; Wed, 16 Nov 2016 19:41:41 +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 625F6CEF; Wed, 16 Nov 2016 19:41:41 +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 uAGJfenp007186; Wed, 16 Nov 2016 19:41:40 GMT (envelope-from acm@FreeBSD.org) Received: (from acm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAGJfegL007185; Wed, 16 Nov 2016 19:41:40 GMT (envelope-from acm@FreeBSD.org) Message-Id: <201611161941.uAGJfegL007185@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: acm set sender to acm@FreeBSD.org using -f From: Jose Alonso Cardenas Marquez Date: Wed, 16 Nov 2016 19:41:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426262 - head/sysutils/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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Nov 2016 19:41:41 -0000 Author: acm Date: Wed Nov 16 19:41:40 2016 New Revision: 426262 URL: https://svnweb.freebsd.org/changeset/ports/426262 Log: - Remove duplicate patch file patch-src-stored_Makefile.in - Fix build PR: 214578 Reported by: ohartmann at walstatt.org Deleted: head/sysutils/bareos-server/files/patch-src-stored_Makefile.in Modified: head/sysutils/bareos-server/files/patch-src-stored-Makefile.in Modified: head/sysutils/bareos-server/files/patch-src-stored-Makefile.in ============================================================================== --- head/sysutils/bareos-server/files/patch-src-stored-Makefile.in Wed Nov 16 19:02:08 2016 (r426261) +++ head/sysutils/bareos-server/files/patch-src-stored-Makefile.in Wed Nov 16 19:41:40 2016 (r426262) @@ -1,10 +1,73 @@ ---- src/stored/Makefile.in 2015-07-25 16:28:12.065608000 -0500 -+++ src/stored/Makefile.in 2015-07-25 16:28:34.672920000 -0500 -@@ -243,7 +243,6 @@ - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape - @srcconf=bareos-sd.conf; \ -- $(MKDIR) ${DESTDIR}${confdir}/bareos-sd.d/; \ - if test -f ${DESTDIR}${confdir}/$$srcconf; then \ - destconf=$$srcconf.new; \ - echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ +--- src/stored/Makefile.in 2016-10-16 10:14:36.000000000 -0500 ++++ src/stored/Makefile.in 2016-11-09 15:54:32.944172000 -0500 +@@ -93,6 +93,7 @@ + INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include + + JANSSON_CPPFLAGS = @JANSSON_INC@ ++JANSSON_LDFLAGS = @JANSSON_LIBS@ + + DEBUG = @DEBUG@ + GETTEXT_LIBS = @LIBINTL@ +@@ -170,7 +171,7 @@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(SDOBJS) \ + $(NDMP_LIBS) -lbareossd -lbareoscfg -lbareos -lm $(DLIB) $(LIBS) $(WRAPLIBS) \ +- $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS} + + static-bareos-sd: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SDOBJS) \ + ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \ +@@ -192,7 +193,7 @@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(TAPEOBJS) \ + -lbareossd -lbareoscfg -lbareos $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) + + bls: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) \ + ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \ +@@ -201,7 +202,7 @@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ + -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) + + bextract: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BEXTOBJS) \ + ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \ +@@ -210,7 +211,7 @@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) \ + -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(BEXTRACT_LIBS) \ +- $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) + + bscan: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SCNOBJS) \ + ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \ +@@ -220,13 +221,13 @@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ + -lbareossql -lbareoscats $(DB_LIBS) -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) \ +- $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS} + + bcopy: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(COPYOBJS) \ + ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(COPYOBJS) \ +- -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status + cd $(topdir) \ +@@ -259,8 +260,8 @@ + destconf="$$RESDIR/$$RES.new"; \ + echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \ + else \ +- destconf="$$RESDIR/$$RES"; \ +- echo " $$RESTYPE/$$RES as \"$$destconf\""; \ ++ destconf="$$RESDIR/$$RES.sample"; \ ++ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \ + fi; \ + ${INSTALL_CONFIG} "$$f" "$$destconf"; \ + if test "x${sd_group}" != "x"; then \