Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Feb 2014 08:42:53 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r344503 - head/lang/modula3
Message-ID:  <201402160842.s1G8grwB012963@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sun Feb 16 08:42:53 2014
New Revision: 344503
URL: http://svnweb.freebsd.org/changeset/ports/344503
QAT: https://qat.redports.org/buildarchive/r344503/

Log:
  lang/modula3: Add custom DEC/CM3 license
  
  It doesn't appear possible to have two custom licenses combined, so I
  had to get creative and concatenate them into one combined document.
  Also, the auto-generated plist had to be modified to add the three new
  entries.  There may be a better way to do this (e.g. use >> ${TMPPLIST}
  instead of > ${TMPPLIST} on first line) but at least the awk method
  works durably.

Modified:
  head/lang/modula3/Makefile

Modified: head/lang/modula3/Makefile
==============================================================================
--- head/lang/modula3/Makefile	Sun Feb 16 08:22:58 2014	(r344502)
+++ head/lang/modula3/Makefile	Sun Feb 16 08:42:53 2014	(r344503)
@@ -3,7 +3,7 @@
 
 PORTNAME=	modula3
 PORTVERSION=	5.8.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	https://modula3.elegosoft.com/cm3/releng/ \
 		http://downloads.dragonlace.net/m3/ \
@@ -13,6 +13,11 @@ DISTFILES=	${SRCDISTFILE} ${BOOTDIST}
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Critical Mass Modula-3 compiler
 
+LICENSE=	DECM3
+LICENSE_FILE=	${WRKSRC}/COM_LICENSE
+LICENSE_NAME=	CM3 License defined by DEC and Critical Mass copyrights
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/libiodbc
 
 NEWBOOTDIR=	${WRKDIR}/new-bootstrap/bootstrap
@@ -73,6 +78,7 @@ do-extract:
 	@${MKDIR} ${WRKSRC}
 	@(cd ${WRKSRC} && tar -xf ${DISTDIR}/${SRCDISTFILE})
 	@(cd ${WRKDIR} && tar -xf ${DISTDIR}/${BOOTDIST:C/:[^:]+$//})
+	@(cd ${WRKSRC} && ${CAT} COPYRIGHT-DEC COPYRIGHT-CMASS > COM_LICENSE)
 
 post-patch:
 # Use sed -i instead of ${REINPLACE_CMD} because we don't want .bak files
@@ -138,6 +144,7 @@ post-install:
 	cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
 	   ${SORT} | ${SED} -e 's/^man\/man[1578]\/.*[1578]$$/&.gz/' \
 	   > ${TMPPLIST}
+	@echo ${PLIST_FILES} | awk '{print $$1}' RS=' ' >> ${TMPPLIST}
 	cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${SORT} -r | \
 	   ${SED} -e '/^bin$$/d' -e '/^lib$$/d' -e '/^pkg$$/d' \
 	   -e '/^share\/examples$$/d' -e '/^share\/doc$$/d' -e '/^share$$/d' \



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