Date: Sun, 7 Jul 2013 17:38:21 GMT From: Roman Naumann <namor@hemio.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/180368: [PATCH] hs-git-annex does not build with WEBAPP option enabled Message-ID: <201307071738.r67HcLj5057927@oldred.freebsd.org> Resent-Message-ID: <201307071740.r67He0cC045009@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180368
>Category: ports
>Synopsis: [PATCH] hs-git-annex does not build with WEBAPP option enabled
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 07 17:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Roman Naumann
>Release: 9.1
>Organization:
>Environment:
FreeBSD nomad.local 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #0: Mon Jun 17 11:42:37 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
devel/hs-git-annex will not build when the "WEBAPP" option is set. This is due to two issues:
- www/hs-yesod-default port was removed but is an optional dependency of hs-git-annex, necessary if "WEBAPP" is enabled.
- www/hs-yesod* ports are too new for git-annex-4.20130601
The attached patch does 2 things to solve the issue:
- re-create www/yesod-default (but as version 1.2.0)
- updates hs-git-annex to git-annex-4.20130627 (newest release available) to work with newer yesod versions.
NOTE: DYNAMIC and WEBAPP used together will not compile. Yesod - as dezzy@freenode pointed out - does not allow dynamic linkage yet.
>How-To-Repeat:
Try to install devel/hs-git-annex with the "Webapp" option enabled.
>Fix:
Apply the patch. It is a git created by the tool 'git' and has odd a/ and b/ prefixes at paths, you can use -p1 to cut them off:
root% cd /usr/ports
root% patch -p1 < /path/to/patch.diff.txt
Patch attached with submission follows:
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 6788042..a9daabf 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= git-annex
-PORTVERSION= 4.20130601
+PORTVERSION= 4.20130627
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+= --flags="Webapp"
USE_CABAL+= yesod yesod-static case-insensitive http-types \
transformers wai wai-logger warp blaze-builder \
blaze-html crypto-api hamlet clientsession \
- yesod-default>=1.1.0 data-default
+ data-default
.else
CONFIGURE_ARGS+= --flags="-Webapp"
.endif
diff --git a/devel/hs-git-annex/distinfo b/devel/hs-git-annex/distinfo
index 7e93e17..4647133 100644
--- a/devel/hs-git-annex/distinfo
+++ b/devel/hs-git-annex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/git-annex-4.20130601.tar.gz) = 96228918c356bc3e23693fd0c48e2557c68d97c769a7e76082851b91535cd250
-SIZE (cabal/git-annex-4.20130601.tar.gz) = 3332000
+SHA256 (cabal/git-annex-4.20130627.tar.gz) = 7ed88cfb1d2b1122a401b6fc20d30adcdc333411260c536de82d12500f6c30e1
+SIZE (cabal/git-annex-4.20130627.tar.gz) = 20531993
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index 0de54c2..c3dedaf 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -402,6 +402,7 @@ yaml_port= textproc/hs-yaml
yesod_port= www/hs-yesod
yesod-auth_port= www/hs-yesod-auth
yesod-core_port= www/hs-yesod-core
+yesod-default_port= www/hs-yesod-default
yesod-form_port= www/hs-yesod-form
yesod-persistent_port= www/hs-yesod-persistent
yesod-platform_port= www/hs-yesod-platform
diff --git a/www/hs-yesod-default/Makefile b/www/hs-yesod-default/Makefile
new file mode 100644
index 0000000..90ea8ea
--- /dev/null
+++ b/www/hs-yesod-default/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= yesod-default
+PORTVERSION= 1.2.0
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Default config and main functions for your yesod application
+
+LICENSE= MIT
+
+USE_CABAL= data-default hamlet>=1.1 network-conduit>=0.5 safe \
+ shakespeare-css>=1.0 shakespeare-js>=1.0 text>=0.9 \
+ transformers>=0.2.2 unordered-containers wai>=1.3 \
+ wai-extra>=1.3 warp>=1.3 yaml>=0.8 yesod-core>=1.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-yesod-default/distinfo b/www/hs-yesod-default/distinfo
new file mode 100644
index 0000000..d11707a
--- /dev/null
+++ b/www/hs-yesod-default/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/yesod-default-1.2.0.tar.gz) = f39ae1953a95c1919a9dd214d93bf81078b1dcbbac737dc9bb7339dbad9dda96
+SIZE (cabal/yesod-default-1.2.0.tar.gz) = 1397
diff --git a/www/hs-yesod-default/pkg-descr b/www/hs-yesod-default/pkg-descr
new file mode 100644
index 0000000..5d7241f
--- /dev/null
+++ b/www/hs-yesod-default/pkg-descr
@@ -0,0 +1,4 @@
+Convenient wrappers for your the configuration and execution of your yesod
+application.
+
+WWW: http://www.yesodweb.com/
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307071738.r67HcLj5057927>