Date: Fri, 4 Jul 2014 21:31:27 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360663 - in head/sysutils/bacula-server: . files Message-ID: <201407042131.s64LVRBx091882@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Fri Jul 4 21:31:26 2014 New Revision: 360663 URL: http://svnweb.freebsd.org/changeset/ports/360663 QAT: https://qat.redports.org/buildarchive/r360663/ Log: - Keep la files, this fixes bacula-server build - A few fixes (put man pages in the good packages, do not remove things done by the client dependency in the server part) Deleted: head/sysutils/bacula-server/files/pkg-deinstall.server.in head/sysutils/bacula-server/files/pkg-install.server.in Modified: head/sysutils/bacula-server/Makefile head/sysutils/bacula-server/pkg-plist head/sysutils/bacula-server/pkg-plist.client Modified: head/sysutils/bacula-server/Makefile ============================================================================== --- head/sysutils/bacula-server/Makefile Fri Jul 4 21:03:35 2014 (r360662) +++ head/sysutils/bacula-server/Makefile Fri Jul 4 21:31:26 2014 (r360663) @@ -3,7 +3,7 @@ PORTNAME= bacula DISTVERSION= 5.2.12 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -12,7 +12,7 @@ PKGNAMESUFFIX?= -server MAINTAINER= dan@langille.org COMMENT?= Network backup solution (server) -USES+= libtool +USES+= libtool:keepla LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2 @@ -48,7 +48,7 @@ USE_RC_SUBR?= bacula-dir bacula-sd .if defined(WITH_CLIENT_ONLY) SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client .else -SUB_FILES+= pkg-install.server pkg-deinstall.server pkg-message.server +SUB_FILES+= pkg-message.server .endif MANCOMPRESSED= yes @@ -98,10 +98,6 @@ SUB_LIST= BACULA_USER=${BACULA_USER} \ NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -# overridden if client install -PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.server -PKGINSTALL= ${FILESDIR}/pkg-install.server - # Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFFILES= fd @@ -146,7 +142,7 @@ MP8+= bacula.8 bacula-dir.8 bacula-sd.8 MP1+= bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1 .endif -MAKE_ENV+= MO8="${MAN8}" MAN1="${MP1}" +MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: # This port does not install docs. See bacula-docs for that Modified: head/sysutils/bacula-server/pkg-plist ============================================================================== --- head/sysutils/bacula-server/pkg-plist Fri Jul 4 21:03:35 2014 (r360662) +++ head/sysutils/bacula-server/pkg-plist Fri Jul 4 21:31:26 2014 (r360663) @@ -3,12 +3,15 @@ @sample %%ETCDIR%%/bacula-dir.conf.sample @group wheel @sample %%ETCDIR%%/bacula-sd.conf.sample +lib/libbaccats.la lib/libbaccats.so lib/libbaccats.so.5 lib/libbaccats.so.5.0.2 +lib/libbaccats-%%DBTYPE%%.la lib/libbaccats-%%DBTYPE%%.so lib/libbaccats-%%DBTYPE%%.so.5 lib/libbaccats-%%DBTYPE%%.so.5.0.2 +lib/libbacsql.la lib/libbacsql.so lib/libbacsql.so.5 lib/libbacsql.so.5.0.2 @@ -16,10 +19,8 @@ man/man1/bacula-bwxconsole.1.gz man/man1/bacula-tray-monitor.1.gz man/man1/bsmtp.1.gz man/man8/bacula-dir.8.gz -man/man8/bacula-fd.8.gz man/man8/bacula-sd.8.gz man/man8/bacula.8.gz -man/man8/bconsole.8.gz man/man8/bcopy.8.gz man/man8/bextract.8.gz man/man8/bls.8.gz @@ -76,7 +77,3 @@ sbin/dbcheck %%DATADIR%%/update_%%DBTYPE%%_tables @owner root @group wheel -@dirrm %%DATADIR%% -@exec mkdir -p %%BACULA_DIR%% -@dirrmtry %%BACULA_DIR%% -@dirrmtry %%ETCDIR%% Modified: head/sysutils/bacula-server/pkg-plist.client ============================================================================== --- head/sysutils/bacula-server/pkg-plist.client Fri Jul 4 21:03:35 2014 (r360662) +++ head/sysutils/bacula-server/pkg-plist.client Fri Jul 4 21:31:26 2014 (r360663) @@ -2,33 +2,25 @@ @group bacula @sample %%ETCDIR%%/bconsole.conf.sample @group wheel +lib/libbac.la lib/libbac.so lib/libbac.so.5 lib/libbac.so.5.0.2 +lib/libbaccfg.la lib/libbaccfg.so lib/libbaccfg.so.5 lib/libbaccfg.so.5.0.2 +lib/libbacfind.la lib/libbacfind.so lib/libbacfind.so.5 lib/libbacfind.so.5.0.2 +lib/libbacpy.la lib/libbacpy.so lib/libbacpy.so.5 lib/libbacpy.so.5.0.2 lib/bpipe-fd.so -man/man8/bacula-dir.8.gz man/man8/bacula-fd.8.gz -man/man8/bacula-sd.8.gz -man/man8/bacula.8.gz man/man8/bconsole.8.gz -man/man8/bcopy.8.gz -man/man8/bextract.8.gz -man/man8/bls.8.gz -man/man8/bregex.8.gz -man/man8/bscan.8.gz -man/man8/btape.8.gz -man/man8/btraceback.8.gz -man/man8/bwild.8.gz -man/man8/dbcheck.8.gz sbin/bacula-fd @group bacula sbin/bconsole
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407042131.s64LVRBx091882>