Re: [update] Bacula 2.4.1 (not Backup)

2008-07-11 Thread Jason Dixon 
Works fine for me with a DDS-3, upgraded from 2.2.8.

Thanks,
Jason

On Thu, Jul 10, 2008 at 05:05:46PM -0400, Mike Erdely wrote:
 On Thu, Jul 10, 2008 at 04:49:22PM -0400, Mike Erdely wrote:
  The following diff updates bacula to 2.4.1.
 
 As ajacoutot pointed out, I should be using ${PREFIX}, not ${LOCALBASE}
 in files/README-*.OpenBSD.
 
 -ME
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/sysutils/bacula/Makefile,v
 retrieving revision 1.10
 diff -u -p -r1.10 Makefile
 --- Makefile  16 Feb 2008 21:22:41 -  1.10
 +++ Makefile  10 Jul 2008 20:44:02 -
 @@ -3,10 +3,11 @@
  COMMENT-main=network backup solution (client)
  COMMENT-server=  network backup solution (server)
  
 -V=   2.2.8
 +V=   2.4.1
  DISTNAME=bacula-$V
 -FULLPKGNAME-main=bacula-client-$Vp0
 -PKGNAME-server=  bacula-server-$Vp0
 +FULLPKGNAME-main=bacula-client-$V
 +FULLPKGPATH-main=${PKGPATH},-main
 +PKGNAME-server=  bacula-server-$V
  CATEGORIES=  sysutils
  
  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=bacula/}
 @@ -52,12 +53,14 @@ CONFIGURE_ARGS=   --enable-smartalloc \
   --with-dir-group=_bacula \
   --with-sd-user=${SD_USER} \
   --with-sd-group=_bacula \
 + --with-archivedir=/tmp \
   --with-sbin-perm=755 \
   --without-x \
   --without-tcp-wrappers \
   --without-smtp-host \
   --without-job-email \
   --without-dump-email \
 + --without-qwt \
   --disable-gnome \
   --disable-bwx-console \
   --disable-tray-monitor \
 @@ -101,7 +104,7 @@ CONFIGURE_ARGS+=  --without-postgresql \
   --without-sqlite \
   --without-sqlite3 \
   --enable-batch-insert
 -LIB_DEPENDS+=lib/mysql/mysqlclient.=10::databases/mysql
 +LIB_DEPENDS+=mysqlclient_r.=18::databases/mysql
  BACKEND= mysql
  .else
  CONFIGURE_ARGS+= --without-mysql
 @@ -144,23 +147,26 @@ LIB_DEPENDS-main=
  
  PSEUDO_FLAVORS+= no_bat
  .if ${FLAVOR:L:Mno_bat}
 -CONFIGURE_ARGS+= --disable-bat \
 - --without-qwt
 +CONFIGURE_ARGS+= --disable-bat
  .else
 -CONFIGURE_ARGS+= --enable-bat \
 - --with-qwt=${LOCALBASE}
 -FULLPKGNAME-bat= bacula-bat-$Vp0
 -WANTLIB-bat= ${WANTLIB} ICE QtCore QtGui SM X11 Xcursor Xext Xfixes
 -WANTLIB-bat+=Xi Xinerama Xrandr Xrender fontconfig freetype 
 glib-2.0
 -WANTLIB-bat+=gthread-2.0 iconv intl png
 +CONFIGURE_ARGS+= --enable-bat
 +FULLPKGNAME-bat= bacula-bat-$V
 +FULLPKGPATH-bat= ${PKGPATH},-bat
 +WANTLIB-bat= ${WANTLIB} ICE SM X11 Xcursor Xext Xfixes
 +WANTLIB-bat+=Xi Xinerama Xrandr Xrender fontconfig freetype
 +WANTLIB-bat+=glib-2.0 gthread-2.0 iconv intl png
  MULTI_PACKAGES+= -bat
 -LIB_DEPENDS-bat= qwt.=5::x11/qwt
 +LIB_DEPENDS-bat= QtCore,QtGui::x11/qt4
  COMMENT-bat= network backup solution (gui-client)
  .endif
  
 +post-extract:
 + @cp ${FILESDIR}/README-{client,server}.OpenBSD ${WRKDIR}
 +
  pre-configure:
 - perl -pi -e s%!!BACULACONF!!%${BACULACONF}% \
 - ${WRKSRC}/manpages/bat.1 ${WRKSRC}/src/qt-console/main.cpp
 + ${SUBST_CMD} ${WRKSRC}/manpages/bat.1 ${WRKSRC}/src/qt-console/main.cpp 
 \
 + ${WRKDIR}/README-client.OpenBSD \
 + ${WRKDIR}/README-server.OpenBSD
  
  post-install:
   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bacula
 @@ -170,12 +176,8 @@ post-install:
   ${WRKINST}/etc/bacula/bconsole.conf \
   ${PREFIX}/share/examples/bacula/
   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bacula
 - perl -pe 
 s%!!TRUEPREFIX!!%${TRUEPREFIX}%g,s%!!BACULACONF!!%${BACULACONF}%g \
 - ${FILESDIR}/README-client.OpenBSD  \
 - ${PREFIX}/share/doc/bacula/README-client.OpenBSD
 - perl -pe 
 s%!!TRUEPREFIX!!%${TRUEPREFIX}%g,s%!!BACULACONF!!%${BACULACONF}%g,s%!!SD_USER!!%${SD_USER}%g
  \
 - ${FILESDIR}/README-server.OpenBSD  \
 - ${PREFIX}/share/doc/bacula/README-server.OpenBSD
 + ${INSTALL_DATA} ${WRKDIR}/README-{client,server}.OpenBSD \
 + ${PREFIX}/share/doc/bacula/
  .if !${FLAVOR:L:Mno_bat}
   ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin/
   ${INSTALL_DATA} ${WRKINST}/etc/bacula/bat.conf \
 Index: distinfo
 ===
 RCS file: /cvs/ports/sysutils/bacula/distinfo,v
 retrieving revision 1.3
 diff -u -p -r1.3 distinfo
 --- distinfo  7 Feb 2008 02:53:35 -

Re: [update] Bacula 2.4.1 (not Backup)

2008-07-10 Thread Mike Erdely 
On Thu, Jul 10, 2008 at 04:49:22PM -0400, Mike Erdely wrote:
 The following diff updates bacula to 2.4.1.

As ajacoutot pointed out, I should be using ${PREFIX}, not ${LOCALBASE}
in files/README-*.OpenBSD.

-ME

Index: Makefile
===
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile16 Feb 2008 21:22:41 -  1.10
+++ Makefile10 Jul 2008 20:44:02 -
@@ -3,10 +3,11 @@
 COMMENT-main=  network backup solution (client)
 COMMENT-server=network backup solution (server)
 
-V= 2.2.8
+V= 2.4.1
 DISTNAME=  bacula-$V
-FULLPKGNAME-main=  bacula-client-$Vp0
-PKGNAME-server=bacula-server-$Vp0
+FULLPKGNAME-main=  bacula-client-$V
+FULLPKGPATH-main=  ${PKGPATH},-main
+PKGNAME-server=bacula-server-$V
 CATEGORIES=sysutils
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bacula/}
@@ -52,12 +53,14 @@ CONFIGURE_ARGS= --enable-smartalloc \
--with-dir-group=_bacula \
--with-sd-user=${SD_USER} \
--with-sd-group=_bacula \
+   --with-archivedir=/tmp \
--with-sbin-perm=755 \
--without-x \
--without-tcp-wrappers \
--without-smtp-host \
--without-job-email \
--without-dump-email \
+   --without-qwt \
--disable-gnome \
--disable-bwx-console \
--disable-tray-monitor \
@@ -101,7 +104,7 @@ CONFIGURE_ARGS+=--without-postgresql \
--without-sqlite \
--without-sqlite3 \
--enable-batch-insert
-LIB_DEPENDS+=  lib/mysql/mysqlclient.=10::databases/mysql
+LIB_DEPENDS+=  mysqlclient_r.=18::databases/mysql
 BACKEND=   mysql
 .else
 CONFIGURE_ARGS+=   --without-mysql
@@ -144,23 +147,26 @@ LIB_DEPENDS-main=
 
 PSEUDO_FLAVORS+=   no_bat
 .if ${FLAVOR:L:Mno_bat}
-CONFIGURE_ARGS+=   --disable-bat \
-   --without-qwt
+CONFIGURE_ARGS+=   --disable-bat
 .else
-CONFIGURE_ARGS+=   --enable-bat \
-   --with-qwt=${LOCALBASE}
-FULLPKGNAME-bat=   bacula-bat-$Vp0
-WANTLIB-bat=   ${WANTLIB} ICE QtCore QtGui SM X11 Xcursor Xext Xfixes
-WANTLIB-bat+=  Xi Xinerama Xrandr Xrender fontconfig freetype glib-2.0
-WANTLIB-bat+=  gthread-2.0 iconv intl png
+CONFIGURE_ARGS+=   --enable-bat
+FULLPKGNAME-bat=   bacula-bat-$V
+FULLPKGPATH-bat=   ${PKGPATH},-bat
+WANTLIB-bat=   ${WANTLIB} ICE SM X11 Xcursor Xext Xfixes
+WANTLIB-bat+=  Xi Xinerama Xrandr Xrender fontconfig freetype
+WANTLIB-bat+=  glib-2.0 gthread-2.0 iconv intl png
 MULTI_PACKAGES+=   -bat
-LIB_DEPENDS-bat=   qwt.=5::x11/qwt
+LIB_DEPENDS-bat=   QtCore,QtGui::x11/qt4
 COMMENT-bat=   network backup solution (gui-client)
 .endif
 
+post-extract:
+   @cp ${FILESDIR}/README-{client,server}.OpenBSD ${WRKDIR}
+
 pre-configure:
-   perl -pi -e s%!!BACULACONF!!%${BACULACONF}% \
-   ${WRKSRC}/manpages/bat.1 ${WRKSRC}/src/qt-console/main.cpp
+   ${SUBST_CMD} ${WRKSRC}/manpages/bat.1 ${WRKSRC}/src/qt-console/main.cpp 
\
+   ${WRKDIR}/README-client.OpenBSD \
+   ${WRKDIR}/README-server.OpenBSD
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bacula
@@ -170,12 +176,8 @@ post-install:
${WRKINST}/etc/bacula/bconsole.conf \
${PREFIX}/share/examples/bacula/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bacula
-   perl -pe 
s%!!TRUEPREFIX!!%${TRUEPREFIX}%g,s%!!BACULACONF!!%${BACULACONF}%g \
-   ${FILESDIR}/README-client.OpenBSD  \
-   ${PREFIX}/share/doc/bacula/README-client.OpenBSD
-   perl -pe 
s%!!TRUEPREFIX!!%${TRUEPREFIX}%g,s%!!BACULACONF!!%${BACULACONF}%g,s%!!SD_USER!!%${SD_USER}%g
 \
-   ${FILESDIR}/README-server.OpenBSD  \
-   ${PREFIX}/share/doc/bacula/README-server.OpenBSD
+   ${INSTALL_DATA} ${WRKDIR}/README-{client,server}.OpenBSD \
+   ${PREFIX}/share/doc/bacula/
 .if !${FLAVOR:L:Mno_bat}
${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin/
${INSTALL_DATA} ${WRKINST}/etc/bacula/bat.conf \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/bacula/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo7 Feb 2008 02:53:35 -   1.3
+++ distinfo9 Jul 2008 20:20:36 -
@@ -1,5 +1,5 @@
-MD5 (bacula-2.2.8.tar.gz) = RUfQv5+XbV2epfIae9B47g==
-RMD160 (bacula-2.2.8.tar.gz) =