Update to 0.9.23

- fix -pthread/-lc_r-issue

Closes PR:	ports/69855
Submitted by:	Björn Lindström
This commit is contained in:
Volker Stolz 2004-08-05 15:31:25 +00:00
parent 33d441ea18
commit 9d1cfbc872
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=115467
10 changed files with 64 additions and 8 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= darcs
PORTVERSION= 0.9.22
PORTVERSION= 0.9.23
CATEGORIES= devel
MASTER_SITES= http://www.abridgegame.org/darcs/
@ -20,7 +20,7 @@ OPTIONS= SERVER "install server" off
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/" \
LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/ ${PTHREAD_LIBS}" \
CFLAGS=""
USE_GMAKE= yes
MAKEFILE= GNUmakefile

View File

@ -1,2 +1,2 @@
MD5 (darcs-0.9.22.tar.gz) = f459109666543cf3464c178cc0bfabbf
SIZE (darcs-0.9.22.tar.gz) = 368426
MD5 (darcs-0.9.23.tar.gz) = 9bdabbdefaed8ffdfeb0578715e38462
SIZE (darcs-0.9.23.tar.gz) = 377341

View File

@ -0,0 +1,11 @@
--- GNUmakefile.orig Thu Aug 5 17:01:57 2004
+++ GNUmakefile Thu Aug 5 17:02:16 2004
@@ -144,7 +144,7 @@
darcs: $(DARCS_OBJS) darcs.lhs $(C_OBJS) rts.o
@echo Linking $@ ...
@rm -f Main.o Main.hi
- @$(GHC) $(GHCFLAGS) $(LDFLAGS) -o $@ $(OPTLCURLFLAGS) $(ZFLAGS) $^
+ @$(GHC) $(GHCFLAGS) $(patsubst -pthread,-optl-pthread,$(LDFLAGS)) -o $@ $(OPTLCURLFLAGS) $(ZFLAGS) $^
External.o: GHCFLAGS += -fffi
Lock.o: GHCFLAGS += -fffi

View File

@ -0,0 +1,16 @@
--- autoconf.mk.in.orig Thu Aug 5 16:59:14 2004
+++ autoconf.mk.in Thu Aug 5 17:00:04 2004
@@ -49,11 +49,11 @@
% : %.lhs
rm -f Main.hi Main.o
- $(GHC) $(GHCFLAGS) $(LDFLAGS) $(OPTLCURLFLAGS) $(ZFLAGS) -o $@ $^
+ $(GHC) $(GHCFLAGS) $(patsubst -pthread,-optl-pthread,$(LDFLAGS)) $(OPTLCURLFLAGS) $(ZFLAGS) -o $@ $^
% : %.hs
rm -f Main.hi Main.o
- $(GHC) $(GHCFLAGS) $(LDFLAGS) $(OPTLCURLFLAGS) $(ZFLAGS) -o $@ $^
+ $(GHC) $(GHCFLAGS) $(patsubst -pthread,-optl-pthread,$(LDFLAGS)) $(OPTLCURLFLAGS) $(ZFLAGS) -o $@ $^
%.hi : %.o
@:

View File

@ -9,6 +9,7 @@ etc/darcs/bash_completion.d/darcs
%%SERVER%%share/darcs/xslt/common.xslt
%%SERVER%%share/darcs/xslt/errors.xslt
%%SERVER%%share/darcs/xslt/patches.xslt
%%SERVER%%share/darcs/xslt/repos.xslt
%%SERVER%%share/darcs/xslt/styles.css
%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_new
%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_old

View File

@ -6,7 +6,7 @@
#
PORTNAME= darcs
PORTVERSION= 0.9.22
PORTVERSION= 0.9.23
CATEGORIES= devel
MASTER_SITES= http://www.abridgegame.org/darcs/
@ -20,7 +20,7 @@ OPTIONS= SERVER "install server" off
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/" \
LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/ ${PTHREAD_LIBS}" \
CFLAGS=""
USE_GMAKE= yes
MAKEFILE= GNUmakefile

View File

@ -1,2 +1,2 @@
MD5 (darcs-0.9.22.tar.gz) = f459109666543cf3464c178cc0bfabbf
SIZE (darcs-0.9.22.tar.gz) = 368426
MD5 (darcs-0.9.23.tar.gz) = 9bdabbdefaed8ffdfeb0578715e38462
SIZE (darcs-0.9.23.tar.gz) = 377341

View File

@ -0,0 +1,11 @@
--- GNUmakefile.orig Thu Aug 5 17:01:57 2004
+++ GNUmakefile Thu Aug 5 17:02:16 2004
@@ -144,7 +144,7 @@
darcs: $(DARCS_OBJS) darcs.lhs $(C_OBJS) rts.o
@echo Linking $@ ...
@rm -f Main.o Main.hi
- @$(GHC) $(GHCFLAGS) $(LDFLAGS) -o $@ $(OPTLCURLFLAGS) $(ZFLAGS) $^
+ @$(GHC) $(GHCFLAGS) $(patsubst -pthread,-optl-pthread,$(LDFLAGS)) -o $@ $(OPTLCURLFLAGS) $(ZFLAGS) $^
External.o: GHCFLAGS += -fffi
Lock.o: GHCFLAGS += -fffi

View File

@ -0,0 +1,16 @@
--- autoconf.mk.in.orig Thu Aug 5 16:59:14 2004
+++ autoconf.mk.in Thu Aug 5 17:00:04 2004
@@ -49,11 +49,11 @@
% : %.lhs
rm -f Main.hi Main.o
- $(GHC) $(GHCFLAGS) $(LDFLAGS) $(OPTLCURLFLAGS) $(ZFLAGS) -o $@ $^
+ $(GHC) $(GHCFLAGS) $(patsubst -pthread,-optl-pthread,$(LDFLAGS)) $(OPTLCURLFLAGS) $(ZFLAGS) -o $@ $^
% : %.hs
rm -f Main.hi Main.o
- $(GHC) $(GHCFLAGS) $(LDFLAGS) $(OPTLCURLFLAGS) $(ZFLAGS) -o $@ $^
+ $(GHC) $(GHCFLAGS) $(patsubst -pthread,-optl-pthread,$(LDFLAGS)) $(OPTLCURLFLAGS) $(ZFLAGS) -o $@ $^
%.hi : %.o
@:

View File

@ -9,6 +9,7 @@ etc/darcs/bash_completion.d/darcs
%%SERVER%%share/darcs/xslt/common.xslt
%%SERVER%%share/darcs/xslt/errors.xslt
%%SERVER%%share/darcs/xslt/patches.xslt
%%SERVER%%share/darcs/xslt/repos.xslt
%%SERVER%%share/darcs/xslt/styles.css
%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_new
%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_old