diff options
| author | pav <pav@FreeBSD.org> | 2009-12-20 07:13:14 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2009-12-20 07:13:14 +0800 |
| commit | abf2c44930747b21947cccabf75dda2865a10781 (patch) | |
| tree | cb9db639998f32bb48d9b62de36bc6be9d28c14d /sysutils | |
| parent | eb987682bbc848e98415557fb6eb1d1bf706f4fe (diff) | |
| download | freebsd-ports-gnome-abf2c44930747b21947cccabf75dda2865a10781.tar.gz freebsd-ports-gnome-abf2c44930747b21947cccabf75dda2865a10781.tar.zst freebsd-ports-gnome-abf2c44930747b21947cccabf75dda2865a10781.zip | |
- Fixes to bacula-bat: add dependency on the libraries (needed to run), and fix
the installation problem for some people
PR: ports/137957, ports/140969
Approved by: maintainer
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/bacula-bat/Makefile | 9 | ||||
| -rw-r--r-- | sysutils/bacula-server/Makefile | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sysutils/bacula-bat/Makefile b/sysutils/bacula-bat/Makefile index e556b0cb1eda..de812125a40d 100644 --- a/sysutils/bacula-bat/Makefile +++ b/sysutils/bacula-bat/Makefile @@ -10,7 +10,8 @@ PKGNAMESUFFIX= -bat COMMENT= The network backup solution (GUI) -LIB_DEPENDS+= qwt.5:${PORTSDIR}/x11-toolkits/qwt5 +LIB_DEPENDS+= qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \ + bac.1:${PORTSDIR}/sysutils/bacula-client USE_QT_VER= 4 QT_COMPONENTS= qmake_build uic_build moc_build rcc_build @@ -39,7 +40,11 @@ post-install: do-install: # Install config files and preserve existing ones - ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/.libs/bat ${PREFIX}/sbin + @if [ -f ${WRKSRC}/src/qt-console/bat ]; then \ + ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin; \ + else \ + ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/.libs/bat ${PREFIX}/sbin; \ + fi ${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${PREFIX}/etc/bat.conf.sample ${GZIP_CMD} ${WRKSRC}/manpages/bat.1 ${INSTALL_MAN} ${WRKSRC}/manpages/bat.1.gz ${PREFIX}/man/man1/ diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile index 2d0c2dbcf532..adca57c429fa 100644 --- a/sysutils/bacula-server/Makefile +++ b/sysutils/bacula-server/Makefile @@ -21,6 +21,7 @@ UNIQUENAME?=${PORTNAME}${PKGNAMESUFFIX} DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz +.if !defined(WITH_BAT) PORTDOCS= VERIFYING \ technotes \ ChangeLog \ @@ -28,6 +29,7 @@ PORTDOCS= VERIFYING \ ReleaseNotes \ LICENSE \ INSTALL +.endif .if !defined(WITH_BAT) .if !defined(WITH_CLIENT_ONLY) @@ -117,11 +119,6 @@ USE_GNOME= libgnome gnomelibs libgnomeui PLIST_SUB+= BACULA_DIR=${BACULA_DIR} .endif -# sysutils/bacula-bat does not install PORTDOCS. -.if defined(WITH_BAT) -PORTDOCS= -.endif - .include <bsd.port.pre.mk> .if defined(WITH_NLS) |