Date: Thu, 19 Oct 2006 07:02:35 -0600 From: "Frank J. Laszlo" <laszlof@vonostingroup.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dan@langille.org Subject: ports/104566: [PATCH]: sysutils/bacula-*-devel: Unbreak client Message-ID: <E1GaXXf-000HKp-5z@main.vonostingroup.com> Resent-Message-ID: <200610191310.k9JDAHkn039552@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 104566
>Category: ports
>Synopsis: [PATCH]: sysutils/bacula-*-devel: Unbreak client
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 19 13:10:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Frank J. Laszlo
>Release: FreeBSD 5.4-RELEASE-p18 i386
>Organization:
>Environment:
System: FreeBSD main.vonostingroup.com 5.4-RELEASE-p18 FreeBSD 5.4-RELEASE-p18 #1: Sat Sep 16 18:56:42 UTC 2006 laszlof@main.vonostingroup.com:/usr/obj/usr/src/sys/MAIN i386
>Description:
Attached are 2 patches for the bacula devel ports. These patches will remove the BROKEN status of
bacula-client-devel, as well as fix some plist and manpage issues that were discovered by myself and
Dan(maintainer). He has been CC'd this PR.
>How-To-Repeat:
>Fix:
--- bacula-client-devel.diff begins here ---
diff -NrU3 bacula-client-devel.orig/Makefile bacula-client-devel/Makefile
--- bacula-client-devel.orig/Makefile Sat Sep 23 17:33:24 2006
+++ bacula-client-devel/Makefile Thu Oct 19 06:42:40 2006
@@ -17,6 +17,4 @@
WITH_CLIENT_ONLY= yes
USE_RC_SUBR= bacula-fd.sh
-BROKEN= Does not install
-
.include "${MASTERDIR}/Makefile"
--- bacula-client-devel.diff ends here ---
--- bacula-server-devel.diff begins here ---
diff -NrU3 bacula-server-devel.orig/Makefile bacula-server-devel/Makefile
--- bacula-server-devel.orig/Makefile Thu Oct 5 15:21:26 2006
+++ bacula-server-devel/Makefile Thu Oct 19 06:36:16 2006
@@ -29,6 +29,7 @@
#
BACULA_DIR?=/var/db/bacula
#
+MANCOMPRESSED= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcp-wrappers=/usr/lib \
--enable-smartalloc \
@@ -166,6 +167,8 @@
MAN8=bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 btraceback.8 dbcheck.8
MAN1=bsmtp.1 bacula-console-gnome.1 bacula-tray-monitor.1 bacula-wxconsole.1
.endif
+MAKE_ARGS+= -E MAN8 -E MAN1
+MAKE_ENV+= MAN8="${MAN8}" MAN1="${MAN1}"
pre-everything::
.if !defined(WITH_CLIENT_ONLY)
@@ -206,7 +209,7 @@
${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in
.else
# In server port don't install filed
- @${REINPLACE_CMD} -e 's|^all_subdirs = .*|all_subdirs = scripts src\/lib src\/findlib $${subdirs}|g' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' ${WRKSRC}/Makefile.in
.endif
pre-install:
@@ -222,18 +225,6 @@
${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
post-install:
-.if defined(MAN8)
-. for manpage in ${MAN8}
- ${INSTALL_MAN} ${WRKSRC}/manpages/${manpage} ${PREFIX}/man/man8/${manpage}
-. endfor
-.endif
-
-.if defined(MAN1)
-. for manpage in ${MAN1}
- ${INSTALL_MAN} ${WRKSRC}/manpages/${manpage} ${PREFIX}/man/man1/${manpage}
-. endfor
-.endif
-
.if defined(WITH_CLIENT_ONLY)
# Extend only /etc/services
@ ${SETENV} PKG_PREFIX=${PREFIX} \
diff -NrU3 bacula-server-devel.orig/pkg-plist.client bacula-server-devel/pkg-plist.client
--- bacula-server-devel.orig/pkg-plist.client Thu Mar 30 12:35:57 2006
+++ bacula-server-devel/pkg-plist.client Thu Oct 19 06:36:16 2006
@@ -2,6 +2,7 @@
sbin/bconsole
%%GNOMECONS%%sbin/gnome-console
%%WXCONS%%sbin/wx-console
+@dirrm %%DATADIR%%
@unexec /usr/bin/killall badula-fd > /dev/null 2>&1 || true
@exec mkdir -p %%BACULA_DIR%%
@dirrmtry %%BACULA_DIR%%
--- bacula-server-devel.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1GaXXf-000HKp-5z>