Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Aug 2019 20:16:48 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
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
Message-ID:  <201908152016.x7FKGmGd046926@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908152016.x7FKGmGd046926>