diff --git a/devel/alex/Makefile b/devel/alex/Makefile index adb4ffbdca8..52024b13ffa 100644 --- a/devel/alex/Makefile +++ b/devel/alex/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.14 2010/06/30 15:41:01 kili Exp $ +# $OpenBSD: Makefile,v 1.15 2010/07/17 13:54:30 kili Exp $ COMMENT = lexical analyser generator for Haskell DISTNAME = alex-2.3.2 -PKGNAME = ${DISTNAME}p2 +REVISION = 2 CATEGORIES = devel HOMEPAGE = http://www.haskell.org/alex/ @@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = c m pthread util +WANTLIB = c gmp m pthread util MODULES = lang/ghc converters/libiconv MODGHC_BUILD = cabal hackage nort @@ -30,7 +30,7 @@ BUILD_DEPENDS += ::textproc/docbook \ ::textproc/docbook-xsl \ ::textproc/libxslt -LIB_DEPENDS = gmp::devel/gmp +LIB_DEPENDS = ::devel/gmp post-build: @cd ${WRKBUILD}/doc && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html diff --git a/devel/cabal-install/Makefile b/devel/cabal-install/Makefile index d3125d1f185..230eee85e15 100644 --- a/devel/cabal-install/Makefile +++ b/devel/cabal-install/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.4 2010/06/30 15:41:01 kili Exp $ +# $OpenBSD: Makefile,v 1.5 2010/07/17 13:54:30 kili Exp $ COMMENT = command-line interface for Cabal and Hackage DISTNAME = cabal-install-0.8.0 -PKGNAME = ${DISTNAME}p2 +REVISION = 2 CATEGORIES = devel HOMEPAGE = http://www.haskell.org/cabal/ @@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = c m pthread util z +WANTLIB = c gmp m pthread util z MODULES = lang/ghc converters/libiconv MODGHC_BUILD = cabal hackage nort @@ -27,6 +27,6 @@ BUILD_DEPENDS += :hs-network->=1,<3:devel/hs-network \ :hs-HTTP->=4000.0.2,<4001:net/hs-HTTP \ :hs-zlib->=0.4,<0.6:archivers/hs-zlib -LIB_DEPENDS = gmp::devel/gmp +LIB_DEPENDS = ::devel/gmp .include diff --git a/devel/cpphs/Makefile b/devel/cpphs/Makefile index eb3bca091c9..a385ae9d034 100644 --- a/devel/cpphs/Makefile +++ b/devel/cpphs/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.14 2010/06/30 15:41:01 kili Exp $ +# $OpenBSD: Makefile,v 1.15 2010/07/17 13:54:30 kili Exp $ COMMENT = liberalised reimplementation of cpp in Haskell DISTNAME = cpphs-1.11 -PKGNAME = ${DISTNAME}p2 +REVISION = 2 CATEGORIES = devel MAINTAINER = Matthias Kilian HOMEPAGE = http://haskell.org/cpphs/ @@ -19,10 +19,10 @@ WANTLIB += c m pthread # Pure Haskell 98. Could also interpret via Hugs .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" -WANTLIB += util +WANTLIB += gmp util MODULES = lang/ghc converters/libiconv MODGHC_BUILD = nort -LIB_DEPENDS = gmp::devel/gmp +LIB_DEPENDS = ::devel/gmp HC = ghc HC_OPTS = -O -o cpphs --make .else diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile index dcd500f0548..243da417f1e 100644 --- a/devel/darcs/Makefile +++ b/devel/darcs/Makefile @@ -1,19 +1,19 @@ -# $OpenBSD: Makefile,v 1.32 2010/06/30 15:41:01 kili Exp $ +# $OpenBSD: Makefile,v 1.33 2010/07/17 13:54:30 kili Exp $ COMMENT = advanced revision control system written in Haskell DISTNAME = darcs-2.4.4 -PKGNAME = ${DISTNAME}p1 +REVISION = 1 CATEGORIES = devel HOMEPAGE = http://www.darcs.net/ -WANTLIB = c m ncurses pthread util z +WANTLIB = c curl.>=2 gmp m ncurses pthread util z MODULES = lang/ghc converters/libiconv MODGHC_BUILD = cabal hackage nort MODGHC_SETUP_CONF_ARGS =-f '-threaded' -LIB_DEPENDS = gmp::devel/gmp \ - curl.>=2::net/curl +LIB_DEPENDS = ::devel/gmp \ + ::net/curl # Yes, build dependencies, because GHC libs are still static and we # don't want to pull in all of ghc. diff --git a/devel/gtk2hs-buildtools/Makefile b/devel/gtk2hs-buildtools/Makefile index fad058c6b31..0091592b8fe 100644 --- a/devel/gtk2hs-buildtools/Makefile +++ b/devel/gtk2hs-buildtools/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 2010/07/10 20:54:07 naddy Exp $ +# $OpenBSD: Makefile,v 1.5 2010/07/17 13:54:30 kili Exp $ COMMENT = tools to build Gtk2Hs DISTNAME = gtk2hs-buildtools-0.9 -PKGNAME = ${DISTNAME}p0 CATEGORIES = devel HOMEPAGE = http://www.haskell.org/gtk2hs/ @@ -16,7 +15,8 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = c m pthread util +REVISION = 0 +WANTLIB = c gmp m pthread util MODULES = lang/ghc converters/libiconv @@ -25,6 +25,6 @@ MODGHC_BUILD = cabal hackage nort BUILD_DEPENDS = ::devel/alex \ ::devel/happy -LIB_DEPENDS = gmp::devel/gmp +LIB_DEPENDS = ::devel/gmp .include diff --git a/devel/haddock/Makefile b/devel/haddock/Makefile index 821b4343f4f..f1357e7da16 100644 --- a/devel/haddock/Makefile +++ b/devel/haddock/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.19 2010/06/30 15:41:01 kili Exp $ +# $OpenBSD: Makefile,v 1.20 2010/07/17 13:54:30 kili Exp $ COMMENT-main = documentation-generation tool for Haskell libraries COMMENT-lib = haddock library DISTNAME = haddock-2.7.2 -PKGNAME-main = ${DISTNAME}p3 +PKGNAME-main = ${DISTNAME} +REVISION-main = 3 PKGNAME-lib = hs-${DISTNAME} CATEGORIES = devel @@ -24,7 +25,7 @@ PERMIT_DISTFILES_FTP = Yes PSEUDO_FLAVORS = no_deps FLAVOR ?= -WANTLIB-main = c m pthread util +WANTLIB-main = c gmp m pthread util .if ! ${FLAVOR:L:Mno_deps} MODULES = lang/ghc converters/libiconv @@ -32,7 +33,7 @@ MODGHC_BUILD = cabal hackage register LIB_DEPENDS-lib = LIB_DEPENDS-main = ${LIB_DEPENDS} \ - gmp::devel/gmp + ::devel/gmp BUILD_DEPENDS += ::devel/alex \ ::devel/happy \ diff --git a/devel/happy/Makefile b/devel/happy/Makefile index 37c2f3b57f1..234aef36764 100644 --- a/devel/happy/Makefile +++ b/devel/happy/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.16 2010/06/30 15:41:01 kili Exp $ +# $OpenBSD: Makefile,v 1.17 2010/07/17 13:54:30 kili Exp $ COMMENT= parser generator for Haskell DISTNAME= happy-1.18.4 -PKGNAME= ${DISTNAME}p2 +REVISION = 2 CATEGORIES= devel HOMEPAGE= http://www.haskell.org/happy/ @@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c m pthread util +WANTLIB= c gmp m pthread util MODULES= lang/ghc converters/libiconv MODGHC_BUILD= cabal hackage nort @@ -23,6 +23,8 @@ BUILD_DEPENDS+= ::textproc/docbook \ ::textproc/docbook-xsl \ ::textproc/libxslt +LIB_DEPENDS = ::devel/gmp + # Required for building the documentation and for the regression tests: USE_GMAKE= Yes CONFIGURE_STYLE= autoconf no-autoheader @@ -30,8 +32,6 @@ AUTOCONF_VERSION= 2.61 AUTOCONF_DIR= ${WRKSRC}/doc WRKCONF= ${AUTOCONF_DIR} -LIB_DEPENDS = gmp::devel/gmp - post-build: @cd ${WRKBUILD}/doc && exec ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} html diff --git a/devel/hmake/Makefile b/devel/hmake/Makefile index 6dd0e006463..adac89a2616 100644 --- a/devel/hmake/Makefile +++ b/devel/hmake/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.15 2010/06/30 15:41:01 kili Exp $ +# $OpenBSD: Makefile,v 1.16 2010/07/17 13:54:30 kili Exp $ COMMENT = compilation manager for Haskell programs DISTNAME = hmake-3.14 -PKGNAME = ${DISTNAME}p2 +REVISION = 2 CATEGORIES = devel HOMEPAGE = http://www.haskell.org/hmake/ @@ -26,10 +26,10 @@ CONFIGURE_STYLE = simple WANTLIB += c m pthread .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" -WANTLIB += util +WANTLIB += gmp util MODULES = lang/ghc converters/libiconv MODGHC_BUILD = nort -LIB_DEPENDS = gmp::devel/gmp +LIB_DEPENDS = ::devel/gmp CONFIGURE_ARGS = --buildwith=ghc WANTLIB += ncurses readline # No LIB_DEPENDS; hmake should be usable without all the ghc packages diff --git a/devel/idoc/Makefile b/devel/idoc/Makefile index 2c9c077119b..ce95986c299 100644 --- a/devel/idoc/Makefile +++ b/devel/idoc/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.12 2010/06/30 15:41:01 kili Exp $ +# $OpenBSD: Makefile,v 1.13 2010/07/17 13:54:30 kili Exp $ COMMENT = minimalist documentation tool for Haskell DISTNAME = idoc-0.2.6 -PKGNAME = ${DISTNAME}p5 +REVISION = 5 CATEGORIES = devel MAINTAINER = Matthias Kilian HOMEPAGE = http://www.cse.unsw.edu.au/~chak/haskell/idoc/ @@ -15,14 +15,14 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = c m +WANTLIB = c gmp m # pure Haskell 98 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" WANTLIB += pthread util MODULES = lang/ghc converters/libiconv MODGHC_BUILD = nort -LIB_DEPENDS = gmp::devel/gmp +LIB_DEPENDS = ::devel/gmp .else BUILD_DEPENDS += ::lang/nhc98 MAKE_FLAGS = HC=nhc98 diff --git a/games/monadius/Makefile b/games/monadius/Makefile index f606fd737c8..7d938051174 100644 --- a/games/monadius/Makefile +++ b/games/monadius/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2010/06/30 15:41:01 kili Exp $ +# $OpenBSD: Makefile,v 1.5 2010/07/17 13:54:30 kili Exp $ COMMENT = Gradius clone DISTNAME = Monadius-0.93 -PKGNAME = ${DISTNAME:L}p2 +PKGNAME = ${DISTNAME:L} +REVISION = 2 CATEGORIES = games HOMEPAGE = http://www.geocities.jp/takascience/haskell/monadius_en.html @@ -13,13 +14,13 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = GL GLU ICE SM X11 Xi Xmu c m pthread util +WANTLIB = GL GLU ICE SM X11 Xi Xmu c glut gmp m pthread util MODULES = lang/ghc converters/libiconv MODGHC_BUILD = cabal hackage nort -LIB_DEPENDS = gmp::devel/gmp \ - glut::graphics/freeglut +LIB_DEPENDS = ::devel/gmp \ + ::graphics/freeglut BUILD_DEPENDS = ::graphics/hs-GLUT \ :hs-OpenGL->=2.0:graphics/hs-OpenGL diff --git a/lang/pugs/Makefile b/lang/pugs/Makefile index e8cac6e34f1..bbafc62231c 100644 --- a/lang/pugs/Makefile +++ b/lang/pugs/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2010/06/30 15:41:02 kili Exp $ +# $OpenBSD: Makefile,v 1.3 2010/07/17 13:54:30 kili Exp $ COMMENT = Perl 6 Implementation DISTNAME = Pugs-6.2.13.15 -PKGNAME = ${DISTNAME}p0 +REVISION = 0 CATEGORIES = lang devel HOMEPAGE = http://pugscode.org/ @@ -15,7 +15,7 @@ PERMIT_DISTFILES_FTP = Yes VMEM_WARNING = Yes -WANTLIB = c m ncurses perl pthread util +WANTLIB = c gmp m ncurses perl pthread util MODULES = lang/ghc converters/libiconv @@ -33,6 +33,6 @@ BUILD_DEPENDS = ::devel/hs-binary \ :hs-pugs-DrIFT->=2.2.3.0:devel/hs-pugs-DrIFT \ :hs-stringtable-atom->=0.0.4:devel/hs-stringtable-atom -LIB_DEPENDS = gmp::devel/gmp +LIB_DEPENDS = ::devel/gmp .include diff --git a/x11/xmobar/Makefile b/x11/xmobar/Makefile index a99a0994704..7200e22d532 100644 --- a/x11/xmobar/Makefile +++ b/x11/xmobar/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2010/06/30 15:41:02 kili Exp $ +# $OpenBSD: Makefile,v 1.4 2010/07/17 13:54:30 kili Exp $ COMMENT = minimalistic text based status bar DISTNAME = xmobar-0.9.2 -PKGNAME = ${DISTNAME}p1 +REVISION = 1 CATEGORIES = x11 HOMEPAGE = http://code.haskell.org/~arossato/xmobar/ @@ -15,12 +15,12 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = X11 Xext Xinerama c m pthread util +WANTLIB = X11 Xext Xinerama c gmp m pthread util MODULES = lang/ghc converters/libiconv MODGHC_BUILD = cabal hackage nort -LIB_DEPENDS = gmp::devel/gmp +LIB_DEPENDS = ::devel/gmp BUILD_DEPENDS = :hs-X11->=1.3.0:x11/hs-X11 \ ::devel/hs-parsec \