head 1.2; access; symbols OPENPKG_E1_MP_HEAD:1.2 OPENPKG_E1_MP:1.2 OPENPKG_E1_MP_2_STABLE:1.2.2.2 OPENPKG_E1_FP:1.2.2.2 OPENPKG_2_STABLE_MP:1.2 OPENPKG_2_STABLE_20061018:1.2.2.2 OPENPKG_2_STABLE:1.2.0.2; locks; strict; comment @# @; 1.2 date 2006.09.22.06.06.13; author rse; state Exp; branches 1.2.2.1; next 1.1; commitid Z00BJO8yZ4JRSMNr; 1.1 date 2006.08.09.20.08.32; author rse; state Exp; branches; next ; commitid ERgEAdC2Sd0wXcIr; 1.2.2.1 date 2006.09.22.06.06.13; author rse; state dead; branches; next 1.2.2.2; commitid iZxwRSmmWscPXUQr; 1.2.2.2 date 2006.10.16.14.51.05; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.2 log @upgrading package: hugs 98.200605 -> 98.200609 @ text @Index: libraries/Makefile.in --- libraries/Makefile.in.orig 2006-08-10 19:31:47 +0200 +++ libraries/Makefile.in 2006-09-22 07:55:38 +0200 @@@@ -164,12 +164,10 @@@@ (echo '#! /bin/sh'; \ echo 'runhugs $(hugsdir)/programs/cpphs/Main.hs "$$@@"') >$(DESTDIR)$(bindir)/cpphs-hugs chmod 755 $(DESTDIR)$(bindir)/cpphs-hugs -# install template file where hsc2hs-hugs expects to find it - hsc2hs_data=`sed -n 's/^datadir *= "\(.*\)"/\1/p' $(BUILD_DIR)/programs/hsc2hs/Paths_hsc2hs.hs`; \ - $(INSTALL) -d $(DESTDIR)$$hsc2hs_data; \ - $(INSTALL) -c -m 0644 ../hsc2hs/template-hsc.h $(DESTDIR)$$hsc2hs_data/template-hsc.h + $(INSTALL) -d $(DESTDIR)$(hugsdir)/programs/hsc2hs + $(INSTALL) -c -m 0644 ../hsc2hs/template-hsc.h $(DESTDIR)$(hugsdir)/hsc2hs/template-hsc.h (echo '#! /bin/sh'; \ - echo 'runhugs -98 $(hugsdir)/programs/hsc2hs/Main.hs -I$(hugsdir)/include "$$@@"') >$(DESTDIR)$(bindir)/hsc2hs-hugs + echo 'runhugs -98 $(hugsdir)/programs/hsc2hs/Main.hs -I$(hugsdir)/include -t$(hugsdir)/hsc2hs/template-hsc.h "$$@@"') >$(DESTDIR)$(bindir)/hsc2hs-hugs chmod 755 $(DESTDIR)$(bindir)/hsc2hs-hugs LibStatus: $(LIBS) Index: src/interns.c --- src/interns.c.orig 2003-11-19 22:49:48 +0100 +++ src/interns.c 2006-09-22 07:51:56 +0200 @@@@ -21,8 +21,8 @@@@ static Void linkInternals Args((Void)); -static Name nameLeft; /* standard data constructors */ -static Name nameRight; +Name nameLeft; /* standard data constructors */ +Name nameRight; static Void local internalControl Args((Int)); static Void local internalControl(what) @ 1.2.2.1 log @file hugs.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:51:05 +0000 @ text @d1 33 @ 1.2.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 33 Index: libraries/Makefile.in --- libraries/Makefile.in.orig 2006-08-10 19:31:47 +0200 +++ libraries/Makefile.in 2006-09-22 07:55:38 +0200 @@@@ -164,12 +164,10 @@@@ (echo '#! /bin/sh'; \ echo 'runhugs $(hugsdir)/programs/cpphs/Main.hs "$$@@"') >$(DESTDIR)$(bindir)/cpphs-hugs chmod 755 $(DESTDIR)$(bindir)/cpphs-hugs -# install template file where hsc2hs-hugs expects to find it - hsc2hs_data=`sed -n 's/^datadir *= "\(.*\)"/\1/p' $(BUILD_DIR)/programs/hsc2hs/Paths_hsc2hs.hs`; \ - $(INSTALL) -d $(DESTDIR)$$hsc2hs_data; \ - $(INSTALL) -c -m 0644 ../hsc2hs/template-hsc.h $(DESTDIR)$$hsc2hs_data/template-hsc.h + $(INSTALL) -d $(DESTDIR)$(hugsdir)/programs/hsc2hs + $(INSTALL) -c -m 0644 ../hsc2hs/template-hsc.h $(DESTDIR)$(hugsdir)/hsc2hs/template-hsc.h (echo '#! /bin/sh'; \ - echo 'runhugs -98 $(hugsdir)/programs/hsc2hs/Main.hs -I$(hugsdir)/include "$$@@"') >$(DESTDIR)$(bindir)/hsc2hs-hugs + echo 'runhugs -98 $(hugsdir)/programs/hsc2hs/Main.hs -I$(hugsdir)/include -t$(hugsdir)/hsc2hs/template-hsc.h "$$@@"') >$(DESTDIR)$(bindir)/hsc2hs-hugs chmod 755 $(DESTDIR)$(bindir)/hsc2hs-hugs LibStatus: $(LIBS) Index: src/interns.c --- src/interns.c.orig 2003-11-19 22:49:48 +0100 +++ src/interns.c 2006-09-22 07:51:56 +0200 @@@@ -21,8 +21,8 @@@@ static Void linkInternals Args((Void)); -static Name nameLeft; /* standard data constructors */ -static Name nameRight; +Name nameLeft; /* standard data constructors */ +Name nameRight; static Void local internalControl Args((Int)); static Void local internalControl(what) @ 1.1 log @new package: hugs 98.200605 (Haskell User's Gofer System (HUGS)) @ text @d1 19 d22 1 a22 1 +++ src/interns.c 2006-08-09 20:44:10 +0200 a33 17 Index: libraries/Makefile.in --- libraries/Makefile.in.orig 2006-05-15 15:55:11 +0200 +++ libraries/Makefile.in 2006-08-09 21:29:42 +0200 @@@@ -158,10 +158,10 @@@@ (echo '#! /bin/sh'; \ echo 'runhugs $(hugsdir)/programs/cpphs/Main.hs "$$@@"') >$(DESTDIR)$(bindir)/cpphs-hugs chmod 755 $(DESTDIR)$(bindir)/cpphs-hugs - $(INSTALL) -d $(DESTDIR)$(datadir)/hsc2hs-0.66 - $(INSTALL) -c -m 0644 ../hsc2hs/template-hsc.h $(DESTDIR)$(datadir)/hsc2hs-0.66/template-hsc.h + $(INSTALL) -d $(DESTDIR)$(hugsdir)/programs/hsc2hs + $(INSTALL) -c -m 0644 ../hsc2hs/template-hsc.h $(DESTDIR)$(hugsdir)/hsc2hs/template-hsc.h (echo '#! /bin/sh'; \ - echo 'runhugs -98 $(hugsdir)/programs/hsc2hs/Main.hs -I$(hugsdir)/include "$$@@"') >$(DESTDIR)$(bindir)/hsc2hs-hugs + echo 'runhugs -98 $(hugsdir)/programs/hsc2hs/Main.hs -I$(hugsdir)/include -t$(hugsdir)/hsc2hs/template-hsc.h "$$@@"') >$(DESTDIR)$(bindir)/hsc2hs-hugs chmod 755 $(DESTDIR)$(bindir)/hsc2hs-hugs LibStatus: $(BUILD_DIR)/.stamp @