diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2019-05-09 18:04:39 +0000 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2019-05-09 18:04:39 +0000 |
| commit | f91e5463a5ec01bf97209158deaa17fb26d79f6e (patch) | |
| tree | cb20595421c6e8310421d71796399bc81eed9785 /sysutils/bareos17-server/files/patch-src-console-Makefile.in | |
| parent | lang/ghc843: remove accidentally added character (diff) | |
- Copy bareos-* ports to bareos17-* ports. bareos-* ports will be updated to
latest version
- Fix bareos17-server build [1]
- Fix installation of sample files
- Bump PORTREVISION
PR: 230456 237165
Reported by: ohartmann at walstatt.org [1], okrg at ukr.net [1]
Notes
Notes:
svn path=/head/; revision=501125
Diffstat (limited to 'sysutils/bareos17-server/files/patch-src-console-Makefile.in')
| -rw-r--r-- | sysutils/bareos17-server/files/patch-src-console-Makefile.in | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/sysutils/bareos17-server/files/patch-src-console-Makefile.in b/sysutils/bareos17-server/files/patch-src-console-Makefile.in new file mode 100644 index 000000000000..b1526de9fb6f --- /dev/null +++ b/sysutils/bareos17-server/files/patch-src-console-Makefile.in @@ -0,0 +1,35 @@ +--- src/console/Makefile.in 2016-10-16 10:14:36.000000000 -0500 ++++ src/console/Makefile.in 2016-11-16 01:14:33.054997000 -0500 +@@ -28,6 +28,7 @@ + CONS_LIBS = @CONS_LIBS@ + + JANSSON_CPPFLAGS = @JANSSON_INC@ ++JANSSON_LDFLAGS = @JANSSON_LIBS@ + + INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include + +@@ -51,12 +52,12 @@ + bconsole: Makefile $(CONSOBJS) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ + $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(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) -L../lib -L../cats -o $@ $(CONSOBJS) \ +- $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) $(GNUTLS_LIBS) ++ $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_STATIC_LIBS) \ ++ $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS) + strip $@ + + +@@ -93,7 +94,7 @@ + $(MKDIR) $(DESTDIR)$(bindir) + $(MKDIR) $(DESTDIR)$(sbindir) + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(bindir)/bconsole; +- @if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) $(bindir)/bconsole $(DESTDIR)$(sbindir)/bconsole; fi ++ @if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) ../bin/bconsole $(DESTDIR)$(sbindir)/bconsole; fi + @srcconf=bconsole.conf; \ + if test -f ${DESTDIR}${confdir}/$$srcconf; then \ + destconf=$$srcconf.new; \ |