Bug 176971 - [PATCH] graphics/sketch: update to 0.3.7, OptionsNG, license
Summary: [PATCH] graphics/sketch: update to 0.3.7, OptionsNG, license
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-03-14 21:20 UTC by nemysis
Modified: 2013-06-04 14:40 UTC (History)
1 user (show)

See Also:


Attachments
sketch-0.3.7.patch (3.89 KB, patch)
2013-03-14 21:20 UTC, nemysis
no flags Details | Diff
sketch.diff (3.92 KB, patch)
2013-03-16 15:43 UTC, nemysis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2013-03-14 21:20:02 UTC
- Update to 0.3.7

Removed file(s):
- files/patch-makefile <-- builds and run good without this patch
- pkg-plist <-- only one entry

Makefile changed:

Port is now safe with NOPORTDOCS=yes in /etc/make.conf

+LICENSE=	GPLv3
+USE_DOS2UNIX=	*.htm *.html *.info *.pl *.sk *.tex *.texi *.txt
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MEXAMPLES}
+PLIST_FILES=	bin/sketch

Changed and refined:
 do-build:
 do-install:

Port maintainer (joerg@FreeBSD.org) is cc'd.

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)

How-To-Repeat: 
portlint -A
looks fine.

port test: clean
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-03-14 21:20:26 UTC
Responsible Changed
From-To: freebsd-ports-bugs->joerg

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 nemysis 2013-03-16 15:43:17 UTC
Move PORTDOCS= from .if variable to the top Makefile, sorry.
Comment 3 William Grzybowski freebsd_committer freebsd_triage 2013-06-02 12:06:33 UTC
Responsible Changed
From-To: joerg->wg

I'll take it.
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-06-04 14:36:34 UTC
Author: wg
Date: Tue Jun  4 13:36:21 2013
New Revision: 319857
URL: http://svnweb.freebsd.org/changeset/ports/319857

Log:
  - Update to 0.3.7 [1]
  - Trim Makefile header [1]
  - Add LICENSE (GPLv3) [1]
  - Use PLIST_FILES instead of pkg-plist [1]
  - Rework DOCS and EXAMPLES (with OptionsNG) [1]
  - Fix build with clang
  - Use MAKEFILE and ALL_TARGET
  
  Changes: http://www.frontiernet.net/~eugene.ressler/updates.htm
  
  PR:		ports/176971 [1]
  Submitted by:	nemysis <nemysis@gmx.ch> [1]
  Approved by:	culot (mentor), maintainer (timeout > 14 days)

Deleted:
  head/graphics/sketch/files/
  head/graphics/sketch/pkg-plist
Modified:
  head/graphics/sketch/Makefile
  head/graphics/sketch/distinfo

Modified: head/graphics/sketch/Makefile
==============================================================================
--- head/graphics/sketch/Makefile	Tue Jun  4 13:03:46 2013	(r319856)
+++ head/graphics/sketch/Makefile	Tue Jun  4 13:36:21 2013	(r319857)
@@ -1,47 +1,65 @@
-# New ports collection makefile for:	sketch
-# Date created:		09 January 2008
-# Whom:			Joerg Wunsch <joerg@FreeBSD.org>
-#
+# Created by: Joerg Wunsch <joerg@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	sketch
-PORTVERSION=	0.2.27
+PORTVERSION=	0.3.7
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.frontiernet.net/~eugene.ressler/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	joerg@FreeBSD.org
-COMMENT=	A 3D Scene Description Translator
+COMMENT=	3D Scene Description Translator
 
+LICENSE=	GPLv3
+
+MAKEFILE=	makefile
+ALL_TARGET=
 USE_GMAKE=	yes
-USE_PERL5_BUILD= yes
+USE_PERL5_BUILD=yes
+USE_DOS2UNIX=	yes
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	manual.html manual.pdf manual
-.endif
+PLIST_FILES=	bin/sketch
 
-.if !defined(NOPORTEXAMPLES)
-PORTEXAMPLES=	2tori.sk buggy.sk bunny.sk cone.sk hand.sk test.sk
-.endif
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
+.if ${PORT_OPTIONS:MDOCS}
+PORTDOCS=	*
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	readme updates.htm
 
-do-configure:
+DOCSRCDIR2=	${WRKSRC}/Doc/sketch
+DOCSDIR2=	${DOCSDIR}/Doc/sketch
+DOC_FILES2=	*
 
-do-build:
-	cd ${WRKSRC} && ${GMAKE} CFLAGS="${CFLAGS}" -f makefile
+DOCSRCDIR3=	${WRKSRC}/Doc
+DOCSDIR3=	${DOCSDIR}/Doc
+DOC_FILES3=	*.eps *.pdf *.png *.sk *.txt *.tex *.texi
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+PORTEXAMPLES=	*.sk
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's/^CC =.*//' \
+		-e 's/$$(CC)/$$(CC) $$(CFLAGS)/g' \
+		-e 's/^YACC =.*/YACC = yacc/' ${WRKSRC}/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sketch ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Doc/manual.html ${WRKSRC}/Doc/manual.pdf ${DOCSDIR}
-	cd ${WRKSRC}/Doc && ${FIND} manual -type f | ${CPIO} -dumpv ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
+	@${MKDIR} ${DOCSDIR3}
+	${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${DOCSDIR3}
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/Data && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/sketch/distinfo
==============================================================================
--- head/graphics/sketch/distinfo	Tue Jun  4 13:03:46 2013	(r319856)
+++ head/graphics/sketch/distinfo	Tue Jun  4 13:36:21 2013	(r319857)
@@ -1,2 +1,2 @@
-SHA256 (sketch-0.2.27.tgz) = 8afa70fda5450b0accbc1b377d9410c9fde29e6aa084984f34111c1006a574d6
-SIZE (sketch-0.2.27.tgz) = 2859938
+SHA256 (sketch-0.3.7.tgz) = 12962ad5fe5a0f7c9fc6d84bd4d09b879bbf604975c839405f1613be657ba804
+SIZE (sketch-0.3.7.tgz) = 2882384
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 5 William Grzybowski freebsd_committer freebsd_triage 2013-06-04 14:36:37 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!