From owner-svn-ports-head@freebsd.org  Thu Aug 15 20:16:49 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2CEFAB54A9;
 Thu, 15 Aug 2019 20:16:49 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 468d5Y03Rmz4NRw;
 Thu, 15 Aug 2019 20:16:49 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D32B11DF05;
 Thu, 15 Aug 2019 20:16:48 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7FKGmAW046928;
 Thu, 15 Aug 2019 20:16:48 GMT (envelope-from rene@FreeBSD.org)
Received: (from rene@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7FKGmGd046926;
 Thu, 15 Aug 2019 20:16:48 GMT (envelope-from rene@FreeBSD.org)
Message-Id: <201908152016.x7FKGmGd046926@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rene set sender to
 rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
Date: Thu, 15 Aug 2019 20:16:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r509050 - in head/www/madsonic-standalone: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: rene
X-SVN-Commit-Paths: in head/www/madsonic-standalone: . files
X-SVN-Commit-Revision: 509050
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Aug 2019 20:16:49 -0000

Author: rene
Date: Thu Aug 15 20:16:48 2019
New Revision: 509050
URL: https://svnweb.freebsd.org/changeset/ports/509050

Log:
  www/madsonic-standalone: convert pkg-message to UCL
  
  While here fix a FATAL portlint error.

Deleted:
  head/www/madsonic-standalone/pkg-message-spacer
Modified:
  head/www/madsonic-standalone/Makefile
  head/www/madsonic-standalone/files/pkg-message.in

Modified: head/www/madsonic-standalone/Makefile
==============================================================================
--- head/www/madsonic-standalone/Makefile	Thu Aug 15 20:07:27 2019	(r509049)
+++ head/www/madsonic-standalone/Makefile	Thu Aug 15 20:16:48 2019	(r509050)
@@ -1,8 +1,8 @@
 # Created by: Jeremie Le Hen <jlh@FreeBSD.org>
-# Based on www/subsonic-standalone
-#
 # $FreeBSD$
 #
+# Based on www/subsonic-standalone
+#
 
 PORTNAME=	madsonic-standalone
 PORTVERSION=	6.0
@@ -70,9 +70,12 @@ SUB_LIST=	SUBSONIC_HOME="${SUBSONIC_HOME}" \
 CONFLICTS_INSTALL=	madsonic-jetty madsonic-resin3 madsonic-tomcat[678]
 
 do-install:
-	@${CAT} ${PKGDIR}/pkg-message-spacer >> ${PKGMESSAGE}
-	@${CAT} ${WRKDIR}/message-transcoding >> ${PKGMESSAGE}
-	@${CAT} ${PKGDIR}/pkg-message-spacer >> ${PKGMESSAGE}
+	${ECHO_CMD} "[" >> ${PKGMESSAGE}
+	${ECHO_CMD} "{ type: install, message: <<EOM" >> ${PKGMESSAGE}
+	${CAT} ${WRKDIR}/message-transcoding >> ${PKGMESSAGE}
+	${ECHO_CMD} "EOM" >> ${PKGMESSAGE}
+	${ECHO_CMD} "}" >> ${PKGMESSAGE}
+	${ECHO_CMD} "]" >> ${PKGMESSAGE}
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/madsonic.war ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/madsonic-booter.jar ${STAGEDIR}${DATADIR}/

Modified: head/www/madsonic-standalone/files/pkg-message.in
==============================================================================
--- head/www/madsonic-standalone/files/pkg-message.in	Thu Aug 15 20:07:27 2019	(r509049)
+++ head/www/madsonic-standalone/files/pkg-message.in	Thu Aug 15 20:16:48 2019	(r509050)
@@ -1,6 +1,3 @@
-
-========================================================================
-
 Enable Madsonic by putting the following line in /etc/rc.conf
   madsonic_enable="YES"