Date: Wed, 25 Jan 2006 11:10:05 GMT From: Dan Langille <dan@langille.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/92291: [UPDATE] sysutils/bacula-server - make DOCS optional and install only with server Message-ID: <200601251110.k0PBA5Nj093632@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/92291; it has been noted by GNATS.
From: Dan Langille <dan@langille.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: freebsd-ports-bugs@FreeBSD.org,
Lars Kller <lars.koeller@uni-bielefeld.de>
Subject: Re: ports/92291: [UPDATE] sysutils/bacula-server - make DOCS optional
and install only with server
Date: Wed, 25 Jan 2006 05:53:08 -0500 (EST)
diff -ruN /usr/ports/sysutils/bacula-server/Makefile bacula-server/Makefile
--- /usr/ports/sysutils/bacula-server/Makefile Fri Jan 20 05:18:27 2006
+++ bacula-server/Makefile Wed Jan 25 05:35:08 2006
@@ -7,12 +7,12 @@
PORTNAME= bacula
PORTVERSION= 1.38.5
-#PORTREVISION= 1
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= bacula
PKGNAMESUFFIX?= -server
-DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz ${PORTNAME}-docs-${PORTVERSION}.tar.gz
+UNIQUENAME?=${PORTNAME}${PKGNAMESUFFIX}
MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
COMMENT?= The network backup solution (server)
@@ -43,7 +43,7 @@
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
-ALL_OPTIONS= CLIENT_ONLY WXCONSOLE GNOMECONSOLE SQLITE3 MYSQL POSTGRESQL MTX OPENSSL
+ALL_OPTIONS= CLIENT_ONLY WXCONSOLE GNOMECONSOLE SQLITE3 MYSQL POSTGRESQL MTX OPENSSL DOCS
.for opt in ${ALL_OPTIONS}
.if defined(WITH_${opt})
@@ -55,9 +55,11 @@
IS_INTERACTIVE= yes
.endif
+
.if defined(WITH_CLIENT_ONLY)
OPTIONS+= WXCONSOLE "Build with wxGTK based GUI console" off
OPTIONS+= GNOMECONSOLE "Build with GNOME based GUI console" off
+OPTIONS+= DOCS "Install documention" off
.else
OPTIONS= SQLITE3 "Use SqLite-3 database instead of SqLite-2" off
OPTIONS+= MYSQL "Use MySQL database instead of SqLite" off
@@ -80,11 +82,19 @@
.include <bsd.port.pre.mk>
+DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz
+.if defined(WITH_DOCS)
+DISTFILES+= ${PORTNAME}-docs-${PORTVERSION}.tar.gz
+.endif
+
+.if defined(WITH_DOCS)
+PORTDOCS= ReleaseNotes bacula.pdf developers.pdf kernstodo manual bacula-web
+.endif
+
# Client only or full server version
.if defined(WITH_CLIENT_ONLY)
CONFFILES= fd
CONFIGURE_ARGS+= --enable-client-only
-PORTDOCS= ReleaseNotes bacula.pdf developers.pdf kernstodo manual bacula-web
PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.client
PKGINSTALL= ${PKGDIR}/pkg-install.client
# Build gnome-console
@@ -158,11 +168,14 @@
@${ECHO_MSG} " WITH_GNOMECONSOLE=yes if you only want a GNOME based GUI console."
@${ECHO_MSG} " WITH_MTX=yes if you want to use mtx instead of chio for autochanger control."
@${ECHO_MSG} " WITH_SQLITE3=yes if you want SqLite-3 instead of SqLite-2 as the database."
+ @${ECHO_MSG} " WITH_DOCS=yes if you want the documentation installed."
+ @${ECHO_MSG} " WITH_OPENSSL=yes Enable OpenSSL for encrypted communication."
.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
@${ECHO_MSG} " WITH_MYSQL=yes if you want MySQL instead of SqLite as the database."
@${ECHO_MSG} " WITH_POSTGRESQL=yes if you want PostgreSQL instead of SqLite as the database."
@${ECHO_MSG} ""
@${ECHO_MSG} "The default DB is SQLite-2!"
+ @${ECHO_MSG} " WITH_OPENSSL=yes Enable OpenSSL for encrypted communication."
.endif
@${ECHO_MSG} ""
@${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database."
@@ -227,8 +240,8 @@
${INSTALL_MAN} ${WRKSRC}/scripts/bacula.man ${PREFIX}/man/man8/bacula.8
.endif
-# Documentaion is only installed in -client port
-.if !defined(NOPORTDOCS)
+# Documentation is only installed in -client port
+.if defined(WITH_DOCS)
for na in manual bacula-web; do \
${MKDIR} ${DOCSDIR}/$$na ;\
cd ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION} && ${FIND} $$na | \
Please replace with this patch:
DOCS now only an option with CLIENT instead of SERVER
DISTFILES now set after .include <bsd.port.pre.mk> so that proper
value of WITH_DOCS is obtained
--
Dan Langille - http://www.langille.org/
BSDCan - The Technical BSD Conference: http://www.bsdcan.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601251110.k0PBA5Nj093632>