Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Mar 2013 22:16:18 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        joerg@FreeBSD.org
Subject:   ports/176971: [PATCH] graphics/sketch: update to 0.3.7, OptionsNG, license
Message-ID:  <20130314211627.B35B9AFA@hub.freebsd.org>
Resent-Message-ID: <201303142120.r2ELK2W0051052@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         176971
>Category:       ports
>Synopsis:       [PATCH] graphics/sketch: update to 0.3.7, OptionsNG, license
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 14 21:20:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec  4 09:23:10
>Description:
- 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

>Fix:

--- sketch-0.3.7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/sketch/Makefile ./Makefile
--- /usr/ports/graphics/sketch/Makefile	2013-01-14 17:57:04.000000000 +0100
+++ ./Makefile	2013-03-14 22:04:14.000000000 +0100
@@ -1,47 +1,62 @@
-# 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: head/graphics/sketch/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 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
 
-USE_GMAKE=	yes
-USE_PERL5_BUILD= yes
+LICENSE=	GPLv3
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	manual.html manual.pdf manual
+USE_GMAKE=	yes
+MAKEFILE=	makefile
+USE_PERL5_BUILD=yes
+USE_DOS2UNIX=	*.htm *.html *.info *.pl *.sk *.tex *.texi *.txt
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+PORTDOCS=	*
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	readme updates.htm
+
+DOCSRCDIR2=	${WRKSRC}/Doc/sketch
+DOCSDIR2=	${DOCSDIR}/Doc/sketch
+DOC_FILES2=	*
+
+DOCSRCDIR3=	${WRKSRC}/Doc
+DOCSDIR3=	${DOCSDIR}/Doc
+DOC_FILES3=	*.eps *.pdf *.png *.sk *.txt *.tex *.texi
 .endif
 
-.if !defined(NOPORTEXAMPLES)
-PORTEXAMPLES=	2tori.sk buggy.sk bunny.sk cone.sk hand.sk test.sk
+.if ${PORT_OPTIONS:MEXAMPLES}
+PORTEXAMPLES=	*.sk
 .endif
 
-.include <bsd.port.pre.mk>
-
-do-configure:
+PLIST_FILES=	bin/sketch
 
 do-build:
-	cd ${WRKSRC} && ${GMAKE} CFLAGS="${CFLAGS}" -f makefile
+	cd ${WRKSRC} && ${GMAKE} CFLAGS="${CFLAGS}"
 
 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>
diff -ruN --exclude=CVS /usr/ports/graphics/sketch/distinfo ./distinfo
--- /usr/ports/graphics/sketch/distinfo	2013-01-14 17:57:04.000000000 +0100
+++ ./distinfo	2013-03-14 12:38:54.000000000 +0100
@@ -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
diff -ruN --exclude=CVS /usr/ports/graphics/sketch/files/patch-makefile ./files/patch-makefile
--- /usr/ports/graphics/sketch/files/patch-makefile	2013-01-14 17:57:04.000000000 +0100
+++ ./files/patch-makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
---- makefile.orig	Tue Sep 25 06:24:08 2007
-+++ makefile	Wed Jan  9 14:44:25 2008
-@@ -5,8 +5,7 @@
- #

- # makefile v0.03

- #

--CC = gcc -O1 -g

--YACC = bison --defines --debug --report=all --yacc

-+YACC = yacc

- LEX = flex

- 

- verdata=$(shell cat version.dat)

-@@ -38,7 +37,7 @@
- 	version.h y.tab.h

- 

- $(EXE) : $(OBJECTS)

--	$(CC) -o $(EXE) $(OBJECTS) -lm

-+	$(CC) $(CFLAGS) -o $(EXE) $(OBJECTS) -lm

- 

- y.tab.c y.tab.h : sketch.y

- 	$(YACC) $<

diff -ruN --exclude=CVS /usr/ports/graphics/sketch/pkg-plist ./pkg-plist
--- /usr/ports/graphics/sketch/pkg-plist	2013-01-14 17:57:04.000000000 +0100
+++ ./pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-bin/sketch
--- sketch-0.3.7.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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