From c984ed6b991c6728fb42bcaf31f1d50380ee2dc0 Mon Sep 17 00:00:00 2001 From: Nicola Vitale Date: Sun, 10 Nov 2013 23:13:21 +0000 Subject: [PATCH] - Remove leading article from COMMENT - Add LICENSE (GPLv2) - Use new syntax in LIB_DEPENDS - Add support for staging - Add option DOCS - Fix build with any compiler - Fix WWW line and remove Author from pkg-descr --- math/chryzodus/Makefile | 19 ++++++++++--------- math/chryzodus/files/patch-makefile.unx | 17 ++++++++++------- math/chryzodus/pkg-descr | 3 +-- math/chryzodus/pkg-plist | 1 - 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/math/chryzodus/Makefile b/math/chryzodus/Makefile index 7915731eac7d..6c50c4facca5 100644 --- a/math/chryzodus/Makefile +++ b/math/chryzodus/Makefile @@ -9,20 +9,21 @@ CATEGORIES= math MASTER_SITES= SF MAINTAINER= nivit@FreeBSD.org -COMMENT= A chryzode (http//www.chryzode.org) explorer +COMMENT= Chryzode (http//www.chryzode.org) explorer -LIB_DEPENDS= alleg:${PORTSDIR}/devel/allegro +LICENSE= GPLv2 + +LIB_DEPENDS= liballeg.so:${PORTSDIR}/devel/allegro WRKSRC= ${WRKDIR}/${PORTNAME} MAKEFILE= makefile.unx -NO_STAGE= yes -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME} +OPTIONS_DEFINE= DOCS -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}; \ - ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} -.endif +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include diff --git a/math/chryzodus/files/patch-makefile.unx b/math/chryzodus/files/patch-makefile.unx index 495b1d6bda18..739c6aa915ef 100644 --- a/math/chryzodus/files/patch-makefile.unx +++ b/math/chryzodus/files/patch-makefile.unx @@ -1,12 +1,15 @@ -$FreeBSD$ ---- makefile.unx Tue Jun 29 17:16:38 2004 -+++ makefile.unx.port Sat Jul 9 21:43:27 2005 -@@ -6,7 +6,7 @@ +--- ./makefile.unx.orig 2004-06-29 17:16:38.000000000 +0200 ++++ ./makefile.unx 2013-11-10 15:12:37.000000000 +0100 +@@ -5,9 +5,9 @@ + # windows MinGW makefile # #--------------------------------------# - CXX = g++ +-CXX = g++ -CFLAGS = -Wall -+CFLAGS = -Wall `allegro-config --cflags` - LDFLAGS = -s -lstdc++ `allegro-config --libs` +-LDFLAGS = -s -lstdc++ `allegro-config --libs` ++CXX ?= g++ ++CFLAGS += -Wall `allegro-config --cflags` ++LDFLAGS += -s -lstdc++ `allegro-config --libs` OBJECTS = main.o gui.o compute.o + diff --git a/math/chryzodus/pkg-descr b/math/chryzodus/pkg-descr index bc2a37e121f6..62f7ee7e8e28 100644 --- a/math/chryzodus/pkg-descr +++ b/math/chryzodus/pkg-descr @@ -6,5 +6,4 @@ the world of chryzodes by yourself using Chryzodus. But one does not even need to know much about chryzodes to use Chryzodus and see beautiful images appear on the screen! -Author: Florian LHERBETTE -WWW: http://chryzodus.sourceforge.net/ +WWW: http://chryzodus.sourceforge.net/ diff --git a/math/chryzodus/pkg-plist b/math/chryzodus/pkg-plist index 3f82ef9a2b2d..fbb199bcf6f4 100644 --- a/math/chryzodus/pkg-plist +++ b/math/chryzodus/pkg-plist @@ -1,4 +1,3 @@ -@comment $FreeBSD$ bin/chryzodus %%PORTDOCS%%%%DOCSDIR%%/chryzode.html %%PORTDOCS%%%%DOCSDIR%%/file.html