From 10cfa6261baa35d56c4d9aa3b36a5391f59cc437 Mon Sep 17 00:00:00 2001 From: obraun Date: Fri, 6 Dec 2002 17:51:08 +0000 Subject: * Make it work with hugs98-200211. * Make portlint happier. * Bump PORTREVISION. PR: ports/46019 Submitted by: maintainer Approved by: portmgr (kris) --- graphics/hs-hgl/Makefile | 38 +++++++++++--------- graphics/hs-hgl/files/patch-aa | 41 --------------------- graphics/hs-hgl/pkg-message | 6 ++++ graphics/hs-hgl/pkg-plist | 77 ++++++++++++++++++++-------------------- graphics/hs-hgl/scripts/hugs-hgl | 3 -- 5 files changed, 66 insertions(+), 99 deletions(-) delete mode 100644 graphics/hs-hgl/files/patch-aa create mode 100644 graphics/hs-hgl/pkg-message delete mode 100644 graphics/hs-hgl/scripts/hugs-hgl (limited to 'graphics') diff --git a/graphics/hs-hgl/Makefile b/graphics/hs-hgl/Makefile index 53851e253245..84bd7cf930a7 100644 --- a/graphics/hs-hgl/Makefile +++ b/graphics/hs-hgl/Makefile @@ -7,10 +7,11 @@ PORTNAME= hgl PORTVERSION= 2.0.4 +PORTREVISION= 1 CATEGORIES= graphics haskell MASTER_SITES= http://haskell.org/graphics/downloads/ -DISTNAME= graphics-${PORTVERSION}.src PKGNAMEPREFIX= hs- +DISTNAME= graphics-${PORTVERSION}.src MAINTAINER= octaphial@yahoo.com @@ -20,27 +21,32 @@ WRKSRC= ${WRKDIR}/graphics-${PORTVERSION} USE_GMAKE= yes USE_XLIB= yes +HGL_LIBS= ${PREFIX}/lib/hugs/x11 +HGL_DOCS= ${PREFIX}/share/doc/hs-hgl + BUILD_WRKSRC= ${WRKSRC}/lib/x11 MAKE_ENV= system=FreeBSD \ - hugs_install=${PREFIX}/share/hugs + hugs_install=${HGL_LIBS} ALL_TARGET= all do-install: - ${MKDIR} ${PREFIX}/share/hugs/lib/x11 - ${MKDIR} ${PREFIX}/share/hugs/demos/hgl - ${INSTALL_SCRIPT} ${PKGDIR}/scripts/hugs-hgl ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/lib/x11/*.hs ${PREFIX}/share/hugs/lib/x11 - ${INSTALL_PROGRAM} ${WRKSRC}/lib/x11/*.o ${PREFIX}/share/hugs/lib/x11 - ${INSTALL_PROGRAM} ${WRKSRC}/lib/x11/*.so ${PREFIX}/share/hugs/lib/x11 - ${INSTALL_DATA} ${WRKSRC}/demos/* ${PREFIX}/share/hugs/demos/hgl - ${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/hugs/demos/hgl + ${MKDIR} ${HGL_LIBS} + ${MKDIR} ${HGL_LIBS}/demos + ${INSTALL_DATA} ${WRKSRC}/lib/x11/*.hs ${HGL_LIBS} + ${INSTALL_PROGRAM} ${WRKSRC}/lib/x11/*.o ${HGL_LIBS} + ${INSTALL_PROGRAM} ${WRKSRC}/lib/x11/*.so ${HGL_LIBS} + ${INSTALL_DATA} ${WRKSRC}/demos/* ${HGL_LIBS}/demos + ${INSTALL_DATA} ${WRKSRC}/test/* ${HGL_LIBS}/demos post-install: - ${MKDIR} ${PREFIX}/share/doc/hgl - ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/hgl - ${INSTALL_DATA} ${WRKSRC}/License ${PREFIX}/share/doc/hgl - ${INSTALL_DATA} ${WRKSRC}/Readme ${PREFIX}/share/doc/hgl - ${INSTALL_DATA} ${WRKSRC}/Version ${PREFIX}/share/doc/hgl - ${INSTALL_DATA} ${WRKSRC}/Version-2.0.4 ${PREFIX}/share/doc/hgl + ${MKDIR} ${HGL_DOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/* ${HGL_DOCS} + ${INSTALL_DATA} ${WRKSRC}/License ${HGL_DOCS} + ${INSTALL_DATA} ${WRKSRC}/Readme ${HGL_DOCS} + ${INSTALL_DATA} ${WRKSRC}/Version ${HGL_DOCS} + ${INSTALL_DATA} ${WRKSRC}/Version-2.0.4 ${HGL_DOCS} + @${ECHO} '' + @${CAT} ${PKGMESSAGE} + @${ECHO} '' .include diff --git a/graphics/hs-hgl/files/patch-aa b/graphics/hs-hgl/files/patch-aa deleted file mode 100644 index 15413dfb577c..000000000000 --- a/graphics/hs-hgl/files/patch-aa +++ /dev/null @@ -1,41 +0,0 @@ ---- lib/x11/X.c.orig Wed Sep 5 16:26:18 2001 -+++ lib/x11/X.c Tue Jan 22 11:18:50 2002 -@@ -5526,8 +5526,8 @@ - #ifdef __cplusplus - extern "C" { - #endif --DLLEXPORT(void) initModule(HugsAPI3 *); --DLLEXPORT(void) initModule(HugsAPI3 *hugsAPI) { -+DLLEXPORT(void) _initModule(HugsAPI3 *); -+DLLEXPORT(void) _initModule(HugsAPI3 *hugsAPI) { - hugs = hugsAPI; - hugs->registerPrims(&prims); - } -diff -Naur graphics-2.0.4.orig/lib/x11/Xlib.c graphics-2.0.4/lib/x11/Xlib.c ---- lib/x11/Xlib.c.orig Wed Sep 5 16:26:18 2001 -+++ lib/x11/Xlib.c Tue Jan 22 11:19:05 2002 -@@ -4349,8 +4349,8 @@ - #ifdef __cplusplus - extern "C" { - #endif --DLLEXPORT(void) initModule(HugsAPI3 *); --DLLEXPORT(void) initModule(HugsAPI3 *hugsAPI) { -+DLLEXPORT(void) _initModule(HugsAPI3 *); -+DLLEXPORT(void) _initModule(HugsAPI3 *hugsAPI) { - hugs = hugsAPI; - hugs->registerPrims(&prims); - } -diff -Naur graphics-2.0.4.orig/lib/x11/Xlib_StdDIS.c graphics-2.0.4/lib/x11/Xlib_StdDIS.c ---- lib/x11/Xlib_StdDIS.c.orig Wed Sep 5 16:26:18 2001 -+++ lib/x11/Xlib_StdDIS.c Tue Jan 22 11:17:48 2002 -@@ -65,8 +65,8 @@ - #ifdef __cplusplus - extern "C" { - #endif --DLLEXPORT(void) initModule(HugsAPI3 *); --DLLEXPORT(void) initModule(HugsAPI3 *hugsAPI) { -+DLLEXPORT(void) _initModule(HugsAPI3 *); -+DLLEXPORT(void) _initModule(HugsAPI3 *hugsAPI) { - hugs = hugsAPI; - hugs->registerPrims(&prims); - } diff --git a/graphics/hs-hgl/pkg-message b/graphics/hs-hgl/pkg-message new file mode 100644 index 000000000000..b85c2079371a --- /dev/null +++ b/graphics/hs-hgl/pkg-message @@ -0,0 +1,6 @@ +---------- +Please set the environment variable HUGSFLAGS "-P{Hugs}/x11:". + +In tcsh: setenv HUGSFLAGS "-P{Hugs}/x11:" +In sh: export HUGSFLAGS="-P{Hugs}/x11:" +---------- diff --git a/graphics/hs-hgl/pkg-plist b/graphics/hs-hgl/pkg-plist index bf24fc9d51c2..e5975b7ec81c 100644 --- a/graphics/hs-hgl/pkg-plist +++ b/graphics/hs-hgl/pkg-plist @@ -1,39 +1,38 @@ -bin/hugs-hgl -share/doc/hgl/License -share/doc/hgl/Readme -share/doc/hgl/Version -share/doc/hgl/Version-2.0.4 -share/doc/hgl/Graphics.dvi -share/doc/hgl/Graphics.tex -share/doc/hgl/appendix.tex -share/doc/hgl/graphics.bib -share/doc/hgl/oldappendix.tex -share/hugs/demos/hgl/HelloWorld.hs -share/hugs/demos/hgl/GTest.hs -share/hugs/demos/hgl/Tests.hs -share/hugs/lib/x11/GraphicsCore.hs -share/hugs/lib/x11/GraphicsDC.hs -share/hugs/lib/x11/GraphicsEvent.hs -share/hugs/lib/x11/GraphicsEvents.hs -share/hugs/lib/x11/GraphicsFlag.hs -share/hugs/lib/x11/GraphicsFont.hs -share/hugs/lib/x11/GraphicsKey.hs -share/hugs/lib/x11/GraphicsPicture.hs -share/hugs/lib/x11/GraphicsRegion.hs -share/hugs/lib/x11/GraphicsTimer.hs -share/hugs/lib/x11/GraphicsUtils.hs -share/hugs/lib/x11/GraphicsWindow.hs -share/hugs/lib/x11/GraphicsWindows.hs -share/hugs/lib/x11/Graphics_Utilities.hs -share/hugs/lib/x11/SOEGraphics.hs -share/hugs/lib/x11/X.hs -share/hugs/lib/x11/X.o -share/hugs/lib/x11/X.so -share/hugs/lib/x11/Xlib.hs -share/hugs/lib/x11/Xlib.o -share/hugs/lib/x11/Xlib.so -share/hugs/lib/x11/Xlib_StdDIS.hs -share/hugs/lib/x11/Xlib_StdDIS.so -@dirrm share/doc/hgl -@dirrm share/hugs/demos/hgl -@dirrm share/hugs/lib/x11 +share/doc/hs-hgl/License +share/doc/hs-hgl/Readme +share/doc/hs-hgl/Version +share/doc/hs-hgl/Version-2.0.4 +share/doc/hs-hgl/Graphics.dvi +share/doc/hs-hgl/Graphics.tex +share/doc/hs-hgl/appendix.tex +share/doc/hs-hgl/graphics.bib +share/doc/hs-hgl/oldappendix.tex +lib/hugs/x11/demos/HelloWorld.hs +lib/hugs/x11/demos/GTest.hs +lib/hugs/x11/demos/Tests.hs +lib/hugs/x11/GraphicsCore.hs +lib/hugs/x11/GraphicsDC.hs +lib/hugs/x11/GraphicsEvent.hs +lib/hugs/x11/GraphicsEvents.hs +lib/hugs/x11/GraphicsFlag.hs +lib/hugs/x11/GraphicsFont.hs +lib/hugs/x11/GraphicsKey.hs +lib/hugs/x11/GraphicsPicture.hs +lib/hugs/x11/GraphicsRegion.hs +lib/hugs/x11/GraphicsTimer.hs +lib/hugs/x11/GraphicsUtils.hs +lib/hugs/x11/GraphicsWindow.hs +lib/hugs/x11/GraphicsWindows.hs +lib/hugs/x11/Graphics_Utilities.hs +lib/hugs/x11/SOEGraphics.hs +lib/hugs/x11/X.hs +lib/hugs/x11/X.o +lib/hugs/x11/X.so +lib/hugs/x11/Xlib.hs +lib/hugs/x11/Xlib.o +lib/hugs/x11/Xlib.so +lib/hugs/x11/Xlib_StdDIS.hs +lib/hugs/x11/Xlib_StdDIS.so +@dirrm share/doc/hs-hgl +@dirrm lib/hugs/x11/demos +@dirrm lib/hugs/x11 diff --git a/graphics/hs-hgl/scripts/hugs-hgl b/graphics/hs-hgl/scripts/hugs-hgl deleted file mode 100644 index 37ca106a7798..000000000000 --- a/graphics/hs-hgl/scripts/hugs-hgl +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -hugs -P{Hugs}/lib/x11: $@ -- cgit