4 files changed, 46 insertions, 50 deletions

diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index ab91acb17abd..f5420d469d06 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -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>
diff --git a/graphics/sketch/distinfo b/graphics/sketch/distinfo
index 339ace04d4b3..c9a95f73202d 100644
--- a/graphics/sketch/distinfo
+++ b/graphics/sketch/distinfo
@@ -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 --git a/graphics/sketch/files/patch-makefile b/graphics/sketch/files/patch-makefile
deleted file mode 100644
index a5776c2006cd..000000000000
--- a/graphics/sketch/files/patch-makefile
+++ /dev/null
@@ -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 --git a/graphics/sketch/pkg-plist b/graphics/sketch/pkg-plist
deleted file mode 100644
index d50ca7e81de1..000000000000
--- a/graphics/sketch/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/sketch