aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorlkoeller <lkoeller@FreeBSD.org>2004-08-06 03:26:48 +0800
committerlkoeller <lkoeller@FreeBSD.org>2004-08-06 03:26:48 +0800
commitca0733fafb887770478b8c4d34c7a2118caebb5e (patch)
tree3bb0c3bdf99fa75567733c77fe36fb5523ed45ba /sysutils
parenteee746ce248946a42eae064c996f7ceb8ecba5e3 (diff)
downloadfreebsd-ports-gnome-ca0733fafb887770478b8c4d34c7a2118caebb5e.tar.gz
freebsd-ports-gnome-ca0733fafb887770478b8c4d34c7a2118caebb5e.tar.zst
freebsd-ports-gnome-ca0733fafb887770478b8c4d34c7a2118caebb5e.zip
o) Fix build of wx-console due to name of wxgtk-2.4-config
o) Fix package build due to wrong path in pkg-plist (see PR below) PR: ports/70019 Submitted by: Victor Prylipko <vic@liniya.ru>
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/bacula-server/Makefile3
-rw-r--r--sysutils/bacula-server/pkg-plist2
-rw-r--r--sysutils/bacula/Makefile3
-rw-r--r--sysutils/bacula/pkg-plist2
4 files changed, 6 insertions, 4 deletions
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 237270f505bc..c99da649e43d 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bacula
PORTVERSION= 1.34.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= bacula
@@ -70,6 +70,7 @@ PLIST_SUB+= GNOMECONS="@comment "
.if defined(WITH_WXCONSOLE)
CONFIGURE_ARGS+= --enable-wx-console
LIB_DEPENDS+= wx_gtk-2.4:${PORTSDIR}/x11-toolkits/wxgtk
+CONFIGURE_ENV+= WXCONFIG=${X11BASE}/bin/wxgtk-2.4-config
PLIST_SUB+= WXCONS=""
.else
# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!)
diff --git a/sysutils/bacula-server/pkg-plist b/sysutils/bacula-server/pkg-plist
index a9ccdbb539a9..9c12c846412e 100644
--- a/sysutils/bacula-server/pkg-plist
+++ b/sysutils/bacula-server/pkg-plist
@@ -1,7 +1,6 @@
%%SERVER%%share/bacula/query.sql
etc/rc.d/bacula.sh.sample
%%SERVER%%sbin/chio-bacula
-%%SERVER%%sbin/mtx-changer
%%SERVER%%sbin/bacula-dir
sbin/bacula-fd
%%SERVER%%sbin/bacula-sd
@@ -14,6 +13,7 @@ sbin/bconsole
%%GNOMECONS%%sbin/gnome-console
%%SERVER%%sbin/dbcheck
%%SERVER%%sbin/bsmtp
+%%SERVER%%share/bacula/mtx-changer
%%SERVER%%share/bacula/create_bacula_database
%%SERVER%%share/bacula/create_%%DBTYPE%%_database
%%SERVER%%share/bacula/drop_bacula_database
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 237270f505bc..c99da649e43d 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bacula
PORTVERSION= 1.34.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= bacula
@@ -70,6 +70,7 @@ PLIST_SUB+= GNOMECONS="@comment "
.if defined(WITH_WXCONSOLE)
CONFIGURE_ARGS+= --enable-wx-console
LIB_DEPENDS+= wx_gtk-2.4:${PORTSDIR}/x11-toolkits/wxgtk
+CONFIGURE_ENV+= WXCONFIG=${X11BASE}/bin/wxgtk-2.4-config
PLIST_SUB+= WXCONS=""
.else
# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!)
diff --git a/sysutils/bacula/pkg-plist b/sysutils/bacula/pkg-plist
index a9ccdbb539a9..9c12c846412e 100644
--- a/sysutils/bacula/pkg-plist
+++ b/sysutils/bacula/pkg-plist
@@ -1,7 +1,6 @@
%%SERVER%%share/bacula/query.sql
etc/rc.d/bacula.sh.sample
%%SERVER%%sbin/chio-bacula
-%%SERVER%%sbin/mtx-changer
%%SERVER%%sbin/bacula-dir
sbin/bacula-fd
%%SERVER%%sbin/bacula-sd
@@ -14,6 +13,7 @@ sbin/bconsole
%%GNOMECONS%%sbin/gnome-console
%%SERVER%%sbin/dbcheck
%%SERVER%%sbin/bsmtp
+%%SERVER%%share/bacula/mtx-changer
%%SERVER%%share/bacula/create_bacula_database
%%SERVER%%share/bacula/create_%%DBTYPE%%_database
%%SERVER%%share/bacula/drop_bacula_database