Date: Fri, 18 May 2018 05:05:00 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470264 - in head/sysutils: . bareos16-bat bareos16-client bareos16-client-static bareos16-server bareos16-traymonitor Message-ID: <201805180505.w4I550cD011666@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Fri May 18 05:05:00 2018 New Revision: 470264 URL: https://svnweb.freebsd.org/changeset/ports/470264 Log: - Copy bareos-* ports to bareso16-*. bareos-* ports will be update to 17.x - Rename bin/bat to bin/bareos-bat. It avoids a problem with textproc/bat port - Few other modifications Added: head/sysutils/bareos16-bat/ - copied from r470256, head/sysutils/bareos-bat/ head/sysutils/bareos16-client/ - copied from r470256, head/sysutils/bareos-client/ head/sysutils/bareos16-client-static/ - copied from r470256, head/sysutils/bareos-client-static/ head/sysutils/bareos16-server/ - copied from r470256, head/sysutils/bareos-server/ head/sysutils/bareos16-traymonitor/ - copied from r470256, head/sysutils/bareos-traymonitor/ Modified: head/sysutils/Makefile head/sysutils/bareos16-bat/Makefile head/sysutils/bareos16-bat/pkg-plist head/sysutils/bareos16-client-static/Makefile head/sysutils/bareos16-client/Makefile head/sysutils/bareos16-server/Makefile head/sysutils/bareos16-server/Makefile.common head/sysutils/bareos16-server/distinfo head/sysutils/bareos16-traymonitor/Makefile Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Fri May 18 04:57:18 2018 (r470263) +++ head/sysutils/Makefile Fri May 18 05:05:00 2018 (r470264) @@ -86,6 +86,11 @@ SUBDIR += baloo-widgets SUBDIR += baloo-widgets-kde4 SUBDIR += bamf + SUBDIR += bareos16-bat + SUBDIR += bareos16-client + SUBDIR += bareos16-client-static + SUBDIR += bareos16-server + SUBDIR += bareos16-traymonitor SUBDIR += bareos-bat SUBDIR += bareos-client SUBDIR += bareos-client-static Modified: head/sysutils/bareos16-bat/Makefile ============================================================================== --- head/sysutils/bareos-bat/Makefile Fri May 18 01:39:41 2018 (r470256) +++ head/sysutils/bareos16-bat/Makefile Fri May 18 05:05:00 2018 (r470264) @@ -1,16 +1,15 @@ -# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ -PORTNAME= bareos +PORTNAME= bareos16 PKGNAMESUFFIX= -bat PORTREVISION= 0 COMMENT= Backup archiving recovery open sourced (GUI) LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 \ - libbareos.so:sysutils/bareos-client + libbareos.so:sysutils/bareos16-client -CONFLICTS= bacula*-bat-* +CONFLICTS= bacula*-bat-* bareos-bat-* USES= pkgconfig desktop-file-utils USE_QT4= qmake_build uic_build moc_build rcc_build @@ -19,7 +18,7 @@ WITH_BAT= yes PLIST= ${.CURDIR}/pkg-plist MAKE_ENV+= MAKEOBJDIRPREFIX=/ -MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server +MASTERDIR= ${.CURDIR}/../../sysutils/bareos16-server CONFIGURE_ARGS+= --enable-bat \ --with-qwt=${LOCALBASE}/lib \ Modified: head/sysutils/bareos16-bat/pkg-plist ============================================================================== --- head/sysutils/bareos-bat/pkg-plist Fri May 18 01:39:41 2018 (r470256) +++ head/sysutils/bareos16-bat/pkg-plist Fri May 18 05:05:00 2018 (r470264) @@ -1,6 +1,6 @@ @sample %%ETCDIR%%/bat.conf.sample -share/applications/bat.desktop +share/applications/bareos-bat.desktop share/pixmaps/bat.png share/pixmaps/bat.svg -man/man1/bat.1.gz -bin/bat +man/man1/bareos-bat.1.gz +bin/bareos-bat Modified: head/sysutils/bareos16-client-static/Makefile ============================================================================== --- head/sysutils/bareos-client-static/Makefile Fri May 18 01:39:41 2018 (r470256) +++ head/sysutils/bareos16-client-static/Makefile Fri May 18 05:05:00 2018 (r470264) @@ -1,14 +1,13 @@ -# Created by: Alonso Cardenas <acm@FreeBSD.org> # $FreeBSD$ -PORTNAME= bareos +PORTNAME= bareos16 PORTREVISION= 0 PKGNAMESUFFIX= -client-static COMMENT= Backup archiving recovery open sourced (static client) PLIST= ${.CURDIR}/pkg-plist -MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server +MASTERDIR= ${.CURDIR}/../../sysutils/bareos16-server PLIST_FILES= sbin/bareos-fd-static \ sbin/bconsole-static Modified: head/sysutils/bareos16-client/Makefile ============================================================================== --- head/sysutils/bareos-client/Makefile Fri May 18 01:39:41 2018 (r470256) +++ head/sysutils/bareos16-client/Makefile Fri May 18 05:05:00 2018 (r470264) @@ -1,7 +1,6 @@ -# Created by: Alonso Cardenas <acm@FreeBSD.org> # $FreeBSD$ -PORTNAME= bareos +PORTNAME= bareos16 PORTREVISION= 0 PKGNAMESUFFIX= -client @@ -13,7 +12,7 @@ WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd PLIST= ${PKGDIR}/pkg-plist.client -MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server +MASTERDIR= ${.CURDIR}/../../sysutils/bareos16-server OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO OPTIONS_DEFAULT=# Modified: head/sysutils/bareos16-server/Makefile ============================================================================== --- head/sysutils/bareos-server/Makefile Fri May 18 01:39:41 2018 (r470256) +++ head/sysutils/bareos16-server/Makefile Fri May 18 05:05:00 2018 (r470264) @@ -1,7 +1,6 @@ -# Created by: Alonso Cardenas <acm@FreeBSD.org> # $FreeBSD$ -PORTNAME= bareos +PORTNAME= bareos16 DISTVERSIONPREFIX= Release/ DISTVERSION= 16.2.7 PORTREVISION?= 0 @@ -16,10 +15,12 @@ LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi USE_GITHUB= yes +GH_ACCOUNT= ${PORTNAME:S/16//} +GH_PROJECT= ${PORTNAME:S/16//} USES+= libtool:keepla pkgconfig readline:port shebangfix -CONFLICTS?= bacula*-server-* +CONFLICTS?= bacula*-server-* bareos-server* LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson @@ -37,6 +38,8 @@ SHEBANG_FILES= ${WRKSRC}/src/cats/make_catalog_backup. CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +ETCDIR= ${PREFIX}/etc/${PORTNAME:S/16//} + OPTIONS_DEFINE?= MTX PYTHON NDMP NLS OPENSSL SCSICRYPTO OPTIONS_DEFAULT?= OPENSSL PGSQL SCSICRYPTO OPTIONS_SUB= yes @@ -67,7 +70,7 @@ PYTHON_CONFIGURE_OFF= --with-python=no PYTHON_PLUGIN= yes .if !defined(WITH_CLIENT_ONLY) -LIB_DEPENDS+= libbareos.so:sysutils/bareos-client +LIB_DEPENDS+= libbareos.so:sysutils/bareos16-client USE_RC_SUBR?= bareos-dir bareos-sd .endif Modified: head/sysutils/bareos16-server/Makefile.common ============================================================================== --- head/sysutils/bareos-server/Makefile.common Fri May 18 01:39:41 2018 (r470256) +++ head/sysutils/bareos16-server/Makefile.common Fri May 18 05:05:00 2018 (r470264) @@ -17,17 +17,20 @@ pre-install: ${FIND} ${WRKSRC}/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \; . endfor .endif +.if ${PKGNAMESUFFIX} == "-bat" + @${MV} ${WRKSRC}/manpages/bat.1 ${WRKSRC}/manpages/${PORTNAME:S/16//}-bat.1 +.endif do-install: .if ${PKGNAMESUFFIX} == "-bat" # Install config files and preserve existing ones ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bareos/bat.conf.sample - ${INSTALL_MAN} ${WRKSRC}/manpages/bat.1 ${STAGEDIR}${PREFIX}/man/man1/ - ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/manpages/${PORTNAME:S/16//}-bat.1 ${STAGEDIR}${PREFIX}/man/man1/ + ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/bin/${PORTNAME:S/16//}-bat ${INSTALL_DATA} ${WRKSRC}/src/images/bat.png ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/src/images/bat.svg ${STAGEDIR}${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/src/qt-console/bat.desktop ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_DATA} ${WRKSRC}/src/qt-console/${PORTNAME:S/16//}-bat.desktop ${STAGEDIR}${DESKTOPDIR} .endif .if ${PKGNAMEPREFIX} == "nagios-check_" @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios Modified: head/sysutils/bareos16-server/distinfo ============================================================================== --- head/sysutils/bareos-server/distinfo Fri May 18 01:39:41 2018 (r470256) +++ head/sysutils/bareos16-server/distinfo Fri May 18 05:05:00 2018 (r470264) @@ -1,3 +1,3 @@ -TIMESTAMP = 1510775285 +TIMESTAMP = 1526612930 SHA256 (bareos-bareos-Release-16.2.7_GH0.tar.gz) = 0b8dbe2e17b3eda470c30d4fe6af92e6f7b668fd1cfc1b045becdc8c8b6a767f SIZE (bareos-bareos-Release-16.2.7_GH0.tar.gz) = 4282998 Modified: head/sysutils/bareos16-traymonitor/Makefile ============================================================================== --- head/sysutils/bareos-traymonitor/Makefile Fri May 18 01:39:41 2018 (r470256) +++ head/sysutils/bareos16-traymonitor/Makefile Fri May 18 05:05:00 2018 (r470264) @@ -1,7 +1,6 @@ -# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ -PORTNAME= bareos +PORTNAME= bareos16 PKGNAMESUFFIX= -traymonitor PORTREVISION= 0 @@ -9,9 +8,9 @@ PORTREVISION= 0 COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 \ - libbareos.so:sysutils/bareos-client + libbareos.so:sysutils/bareos16-client -CONFLICTS= bacula*-bat-* +CONFLICTS= bacula*-bat-* bareos-traymonitor USES= pkgconfig gettext-runtime desktop-file-utils USE_QT4= qmake_build uic_build moc_build rcc_build gui corelib @@ -20,7 +19,7 @@ WITH_BAT= yes PLIST= ${.CURDIR}/pkg-plist MAKE_ENV+= MAKEOBJDIRPREFIX=/ -MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server +MASTERDIR= ${.CURDIR}/../../sysutils/bareos16-server CONFIGURE_ARGS+= --enable-traymonitor=yes \ --with-qwt=${LOCALBASE}/lib \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805180505.w4I550cD011666>