From owner-freebsd-ports Thu Dec 5 19:20: 8 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58F0C37B401 for ; Thu, 5 Dec 2002 19:20:02 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74F6043ED4 for ; Thu, 5 Dec 2002 19:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gB63K1x3036839 for ; Thu, 5 Dec 2002 19:20:01 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gB63K19a036838; Thu, 5 Dec 2002 19:20:01 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B67337B401 for ; Thu, 5 Dec 2002 19:11:22 -0800 (PST) Received: from smtp.postech.ac.kr (smtp1.postech.ac.kr [141.223.2.188]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF45A43EB2 for ; Thu, 5 Dec 2002 19:11:20 -0800 (PST) (envelope-from octphial@postech.ac.kr) Received: from MDOM6212-1.postech.ac.kr (MDOM6212-1.postech.ac.kr [141.223.203.149]) by smtp.postech.ac.kr (v3smtp 8.11.6.6/8.11.1) with SMTP id gB63BDQ25106 for ; Fri, 6 Dec 2002 12:11:13 +0900 (KST) Received: by MDOM6212-1.postech.ac.kr (sSMTP sendmail emulation); Fri, 6 Dec 2002 12:12:20 +0900 Message-Id: <200212060311.gB63BDQ25106@smtp.postech.ac.kr> Date: Fri, 6 Dec 2002 12:12:20 +0900 From: "Byunghyun Oh" To: undisclosed-recipients: ; X-Send-Pr-Version: 3.113 Subject: ports/46019: Maintainer-Update: graphics/hs-hgl Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 46019 >Category: ports >Synopsis: Maintainer-Update: graphics/hs-hgl >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Dec 05 19:20:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: Byunghyun Oh >Release: FreeBSD 4.6.2-RELEASE i386 >Organization: None >Environment: System: FreeBSD MDOM6212-1.postech.ac.kr 4.6.2-RELEASE FreeBSD 4.6.2-RELEASE #0: Sun Sep 8 01:26:43 GMT 2002 octaphial@MDOM6212-1.postech.ac.kr:/usr/src/sys/compile/OCTA i386 >Description: Update because of the version-up of lang/hugs, hs-hgl's dependency >How-To-Repeat: Always reproducible unless ports are in current status. >Fix: --- hs-hgl.diff begins here --- diff -Naur hs-hgl/Makefile hs-hgl.new/Makefile --- hs-hgl/Makefile Wed Nov 27 01:05:41 2002 +++ hs-hgl.new/Makefile Wed Nov 27 01:05:45 2002 @@ -9,8 +9,8 @@ PORTVERSION= 2.0.4 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 +20,32 @@ 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 -Naur hs-hgl/files/patch-aa hs-hgl.new/files/patch-aa --- hs-hgl/files/patch-aa Wed Nov 27 01:05:41 2002 +++ hs-hgl.new/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -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 -Naur hs-hgl/pkg-message hs-hgl.new/pkg-message --- hs-hgl/pkg-message Thu Jan 1 09:00:00 1970 +++ hs-hgl.new/pkg-message Wed Nov 27 01:05:45 2002 @@ -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 -Naur hs-hgl/pkg-plist hs-hgl.new/pkg-plist --- hs-hgl/pkg-plist Wed Nov 27 01:05:41 2002 +++ hs-hgl.new/pkg-plist Wed Nov 27 01:05:45 2002 @@ -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 -Naur hs-hgl/scripts/hugs-hgl hs-hgl.new/scripts/hugs-hgl --- hs-hgl/scripts/hugs-hgl Wed Nov 27 01:05:41 2002 +++ hs-hgl.new/scripts/hugs-hgl Thu Jan 1 09:00:00 1970 @@ -1,3 +0,0 @@ -#!/bin/sh - -hugs -P{Hugs}/lib/x11: $@ --- hs-hgl.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message