Date: Sun, 19 Aug 2012 22:28:15 GMT From: Matthew Grooms <mgroom@shrew.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/170773: bacula-server vs backula-client with pkgng Message-ID: <201208192228.q7JMSFFq066798@red.freebsd.org> Resent-Message-ID: <201208192230.q7JMU9UM011296@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 170773
>Category: ports
>Synopsis: bacula-server vs backula-client with pkgng
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 19 22:30:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Matthew Grooms
>Release: 9.0-RELEASE-p3
>Organization:
>Environment:
reeBSD 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jun 12 02:52:29 UTC 2012 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
The backula-server and bacula-client ports install the same library and man pages into the same target path. I have attached a patch which removes duplicate files from the server plist and makes bacula-client a dependency of bacula-server. I'm not sure if it is 100% correct, but appears to work in my environment.
>How-To-Repeat:
Attempt to build and install both bacula-client and bacula-server on the same host.
>Fix:
--- Makefile.bak 2012-08-19 16:32:17.000000000 -0500
+++ Makefile 2012-08-19 17:09:24.000000000 -0500
@@ -33,6 +33,7 @@
.if !defined(WITH_BAT) && !defined(WITH_NAGIOS_CHECK_ONLY) #Till end of the file
PKGNAMESUFFIX?= -server
+.if defined(WITH_CLIENT_ONLY)
PORTDOCS= VERIFYING \
technotes \
ChangeLog \
@@ -40,9 +41,11 @@
ReleaseNotes \
LICENSE \
INSTALL
+.endif
.if !defined(WITH_CLIENT_ONLY)
USE_RC_SUBR?= bacula-dir bacula-sd
+LIB_DEPENDS+= bac:${PORTSDIR}/sysutils/bacula-client
.endif
.if defined(WITH_CLIENT_ONLY)
@@ -188,7 +191,7 @@
EXTRA_PATCHES+= ${FILESDIR}/extra__manpages__Makefile.in
.else
MAN1= bat.1 bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
-MAN8= bacula.8 bacula-dir.8 bacula-fd.8 bacula-sd.8 bconsole.8 \
+MAN8= bacula.8 bacula-dir.8 bacula-sd.8 \
bcopy.8 bextract.8 bls.8 bregex.8 bscan.8 btape.8 \
btraceback.8 bwild.8 dbcheck.8
.endif
--- pkg-plist.bak 2012-08-19 16:40:40.000000000 -0500
+++ pkg-plist 2012-08-19 16:42:28.000000000 -0500
@@ -1,25 +1,12 @@
-lib/libbac.la
-lib/libbac.so
-lib/libbac.so.%%MAJOR%%
lib/libbaccats-%%DBTYPE%%.la
lib/libbaccats-%%DBTYPE%%.so
lib/libbaccats-%%DBTYPE%%.so.%%MAJOR%%
lib/libbaccats.la
lib/libbaccats.so
lib/libbaccats.so.%%MAJOR%%
-lib/libbaccfg.la
-lib/libbaccfg.so
-lib/libbaccfg.so.%%MAJOR%%
-lib/libbacfind.la
-lib/libbacfind.so
-lib/libbacfind.so.%%MAJOR%%
-lib/libbacpy.la
-lib/libbacpy.so
-lib/libbacpy.so.%%MAJOR%%
lib/libbacsql.la
lib/libbacsql.so
lib/libbacsql.so.%%MAJOR%%
-lib/bpipe-fd.so
sbin/bacula
sbin/bacula-dir
sbin/bacula-sd
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208192228.q7JMSFFq066798>