Index: head/sysutils/bareos16-server/Makefile.common
===================================================================
--- head/sysutils/bareos16-server/Makefile.common	(revision 535683)
+++ head/sysutils/bareos16-server/Makefile.common	(revision 535684)
@@ -1,54 +1,40 @@
 # Created by: Alonso Cardenas <acm@FreeBSD.org>
 # $FreeBSD$
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in
 	@${REINPLACE_CMD} -e 's|-lbareoscfg|@JANSSON_LIBS@ @LIBINTL@ -lbareoscfg|g' ${WRKSRC}/src/qt-tray-monitor/tray-monitor.pro.in
 	@${REINPLACE_CMD} -e 's|@bindir@/bat|@bindir@/${PORTNAME:S/16//}-bat|g' ${WRKSRC}/src/qt-console/bat.desktop.in
 
 post-build:
 .if ${PKGNAMEPREFIX} == "nagios-check_"
 	${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bareos
 .endif
 
 pre-install:
-.if ${PKGNAMESUFFIX} == "-traymonitor"
+.if ${PKGNAMESUFFIX} == "16-traymonitor"
 .	for d in client director monitor storage
 		${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}
 		${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
-	@${MV} ${WRKSRC}/src/qt-console/bat.desktop ${WRKSRC}/src/qt-console/${PORTNAME:S/16//}-bat.desktop
-.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/${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/${PORTNAME:S/16//}-bat.desktop ${STAGEDIR}${DESKTOPDIR}
-.endif
 .if ${PKGNAMEPREFIX} == "nagios-check_"
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \
 	${STAGEDIR}${PREFIX}/libexec/nagios
 .endif
-.if ${PKGNAMESUFFIX} == "-client-static"
+.if ${PKGNAMESUFFIX} == "16-client-static"
 	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bareos-fd ${STAGEDIR}${PREFIX}/sbin/bareos-fd-static
 	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static
 .endif
-.if ${PKGNAMESUFFIX} == "-traymonitor"
+.if ${PKGNAMESUFFIX} == "16-traymonitor"
 # Install config files and preserve existing ones
 .for d in client director monitor storage
 	${INSTALL_SCRIPT} ${WRKSRC}/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor.desktop ${STAGEDIR}${DESKTOPDIR}
 .endif