Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jan 2014 10:22:00 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341530 - head/japanese/zinnia
Message-ID:  <201401281022.s0SAM05m016790@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Tue Jan 28 10:21:59 2014
New Revision: 341530
URL: http://svnweb.freebsd.org/changeset/ports/341530
QAT: https://qat.redports.org/buildarchive/r341530/

Log:
  - Trim Makefile header; remove LICENSE_FILE for a well-known license
  - Set LICENSE for more specific, albeit more ugly, BSD3CLAUSE
  - Remove USE_GMAKE: seems to build fine with BSD default make(1)
  - Stagify, set OPTIONS_DEFINE (for DOCS), convert to use PORTDOCS

Modified:
  head/japanese/zinnia/Makefile
  head/japanese/zinnia/pkg-plist

Modified: head/japanese/zinnia/Makefile
==============================================================================
--- head/japanese/zinnia/Makefile	Tue Jan 28 09:58:20 2014	(r341529)
+++ head/japanese/zinnia/Makefile	Tue Jan 28 10:21:59 2014	(r341530)
@@ -1,42 +1,30 @@
+# Created by: Timothy Beyer <beyert@cs.ucr.edu>
 # $FreeBSD$
 
-# Date created:				15 Aug 2010
-# Whom:					Timothy Beyer <beyert@cs.ucr.edu>
-#
-# $FreeBSD$
-#
-
 PORTNAME=	zinnia
 PORTVERSION=	0.06
 CATEGORIES=	japanese
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF
 
 MAINTAINER=	beyert@cs.ucr.edu
-COMMENT=	Simple, customizable, and portable online hand recognition system
+COMMENT=	Simple, customizable, and portable online handwriting recognition system
 
-LICENSE=	BSD
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	BSD3CLAUSE
 
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+PORTDOCS=	index-ja.html index.html
+
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^pkgconfigdir/s!=.*!= ${PREFIX}/libdata/pkgconfig!' \
-	${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^pkgconfigdir/s!=.*!= ${PREFIX}/libdata/pkgconfig!' \
+			${WRKSRC}/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/index.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/index-ja.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/index-ja.html ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/japanese/zinnia/pkg-plist
==============================================================================
--- head/japanese/zinnia/pkg-plist	Tue Jan 28 09:58:20 2014	(r341529)
+++ head/japanese/zinnia/pkg-plist	Tue Jan 28 10:21:59 2014	(r341530)
@@ -8,10 +8,4 @@ lib/libzinnia.la
 lib/libzinnia.so
 lib/libzinnia.so.0
 libdata/pkgconfig/zinnia.pc
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/index-ja.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/zinnia



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