cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a few obviously wrong dependencies, and remove extra shells in ghc.

Browse Source
This commit is contained in:
espie 2006-11-20 13:07:19 +00:00
parent 85b2fe8d8a
commit b75dec414c
22 changed files with 53 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/lame/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.30 2006/11/11 21:04:27 steven Exp $
# $OpenBSD: Makefile,v 1.31 2006/11/20 13:07:19 espie Exp $
COMMENT= "lame ain't an MP3 encoder"
@ -34,7 +34,7 @@ USE_LIBTOOL= Yes
# XXX gcc3/nasm issue
.if (${MACHINE_ARCH} == "i386") && (${CC} != "egcc")
BUILD_DEPENDS= nasm::devel/nasm
BUILD_DEPENDS= ::devel/nasm
CONFIGURE_ARGS+= --enable-nasm
.else
CONFIGURE_ARGS+= --disable-nasm

4
databases/openldap/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.70 2006/10/29 10:37:59 mbalmer Exp $
# $OpenBSD: Makefile,v 1.71 2006/11/20 13:07:19 espie Exp $
COMMENT= "Open source LDAP software (client)"
COMMENT-server= "Open source LDAP software (server)"
@ -91,7 +91,7 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
LIBS="${LIBS}"
.if ${SUBPACKAGE} == "-server"
RUN_DEPENDS= openldap:${FULLPKGNAME}:databases/openldap
RUN_DEPENDS= :${FULLPKGNAME}:databases/openldap
WANTLIB+= perl util wrap m pthread
.endif

4
devel/alex/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2005/02/14 02:17:34 dons Exp $
# $OpenBSD: Makefile,v 1.6 2006/11/20 13:07:19 espie Exp $
COMMENT= "lexical analyser generator for Haskell"
@ -29,7 +29,7 @@ MAKE_ENV= SGML_CATALOG_FILES=${LOCALBASE}/share/sgml/catalog
DOC_DIR= ${PREFIX}/share/doc/alex
post-build:
@(cd ${WRKSRC}/alex/doc ; ${MAKE_ENV} ${GMAKE} html)
@cd ${WRKSRC}/alex/doc ; ${MAKE_ENV} ${GMAKE} html
post-install:
${INSTALL_DATA_DIR} ${DOC_DIR}

10
devel/c2hs/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2005/05/19 02:41:29 dons Exp $
# $OpenBSD: Makefile,v 1.6 2006/11/20 13:07:19 espie Exp $
# $FreeBSD: ports/devel/hs-c2hs/Makefile,v 1.20 2004/03/25 08:29:28 obraun Exp $
COMMENT= "interface generator for Haskell to C bindings"
@ -18,14 +18,14 @@ CONFIGURE_ARGS+= --prefix=${PREFIX}
SUBST_VARS= V
post-build:
@(cd ${WRKSRC}/doc/c2hs && ${MAKE_PROGRAM} man1/c2hs-config.1 man1/c2hs.1)
@cd ${WRKSRC}/doc/c2hs && ${MAKE_PROGRAM} man1/c2hs-config.1 man1/c2hs.1
post-install:
@(cd ${WRKSRC}/doc/c2hs/man1 && \
${INSTALL_MAN} c2hs-config.1 c2hs.1 ${PREFIX}/man/man1)
@cd ${WRKSRC}/doc/c2hs/man1 && \
${INSTALL_MAN} c2hs-config.1 c2hs.1 ${PREFIX}/man/man1
do-regress:
@(cd ${WRKDIST}/c2hs/tests && ${MAKE_PROGRAM})
@cd ${WRKDIST}/c2hs/tests && ${MAKE_PROGRAM}
# GPL
PERMIT_PACKAGE_CDROM= Yes

6
devel/cpphs/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2005/10/24 03:14:57 dons Exp $
# $OpenBSD: Makefile,v 1.5 2006/11/20 13:07:19 espie Exp $
COMMENT= "liberalised reimplementation of cpp in Haskell"
@ -23,14 +23,14 @@ HC_OPTS= -package base
WANTLIB= c gmp m
do-build:
( cd ${WRKSRC} && ${HC} ${HC_OPTS} cpphs )
cd ${WRKSRC} && ${HC} ${HC_OPTS} cpphs
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/cpphs ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/docs/cpphs.1 ${PREFIX}/man/man1
do-regress:
( cd ${WRKSRC}/tests && ./runtests )
cd ${WRKSRC}/tests && ./runtests
# LGPL
PERMIT_PACKAGE_CDROM= Yes

4
devel/g-wrap/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2006/10/28 11:19:20 espie Exp $
# $OpenBSD: Makefile,v 1.10 2006/11/20 13:07:19 espie Exp $
COMMENT= "provides scheme wrappers"
DISTNAME= g-wrap-1.3.4
@ -25,7 +25,7 @@ WANTLIB= m
LIB_DEPENDS= guile.>=9,guile-ltdl.>=1::lang/guile \
glib.>=1.2::devel/glib
BUILD_DEPENDS= slib::devel/slib
BUILD_DEPENDS= ::devel/slib
USE_GMAKE= Yes
USE_LIBTOOL= Yes

6
devel/haddock/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2004/11/23 11:22:02 espie Exp $
# $OpenBSD: Makefile,v 1.7 2006/11/20 13:07:19 espie Exp $
COMMENT= "documentation tool for the functional language Haskell"
@ -31,11 +31,11 @@ MAKE_ENV= SGML_CATALOG_FILES=${LOCALBASE}/share/sgml/catalog
DOC_DIR= ${PREFIX}/share/doc/haddock
post-build:
@(cd ${WRKSRC}/haddock/doc ; ${MAKE_ENV} ${GMAKE} html)
@cd ${WRKSRC}/haddock/doc ; ${MAKE_ENV} ${GMAKE} html
post-install:
${INSTALL_DATA_DIR} ${DOC_DIR}
@(cp -R ${WRKSRC}/haddock/doc/haddock/* ${DOC_DIR})
@cp -R ${WRKSRC}/haddock/doc/haddock/* ${DOC_DIR}
# BSD style w/o advertising clause
PERMIT_PACKAGE_CDROM= Yes

6
devel/happy/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2004/11/23 11:22:02 espie Exp $
# $OpenBSD: Makefile,v 1.7 2006/11/20 13:07:19 espie Exp $
COMMENT= "parser generator for the functional language Haskell"
@ -31,11 +31,11 @@ MAKE_ENV= SGML_CATALOG_FILES=${LOCALBASE}/share/sgml/catalog
DOC_DIR= ${PREFIX}/share/doc/happy
post-build:
@(cd ${WRKSRC}/happy/doc ; ${MAKE_ENV} ${GMAKE} html)
@cd ${WRKSRC}/happy/doc ; ${MAKE_ENV} ${GMAKE} html
post-install:
${INSTALL_DATA_DIR} ${DOC_DIR}
@(cp -R ${WRKSRC}/happy/doc/happy/* ${DOC_DIR})
@cp -R ${WRKSRC}/happy/doc/happy/* ${DOC_DIR}
# BSD style w/o advertising clause
PERMIT_PACKAGE_CDROM= Yes

4
devel/hs-ports/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2005/03/26 03:37:09 dons Exp $
# $OpenBSD: Makefile,v 1.5 2006/11/20 13:07:19 espie Exp $
# $FreeBSD: ports/devel/hs-hpl/Makefile,v 1.11 2004/03/11 07:48:11 obraun Exp $
# only for archs to which the GHC ffi has been ported
@ -23,7 +23,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX}
SUBST_VARS+= V
do-regress:
@( cd ${WRKDIST}/tests && sh test.sh )
@cd ${WRKDIST}/tests && sh test.sh
# LGPL
PERMIT_PACKAGE_CDROM= Yes

6
devel/idoc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2005/02/20 00:38:49 dons Exp $
# $OpenBSD: Makefile,v 1.6 2006/11/20 13:07:19 espie Exp $
COMMENT= "minimalist documentation tool for Haskell"
@ -13,7 +13,7 @@ MASTER_SITES= ${HOMEPAGE}
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
MODULES= lang/ghc
.else
BUILD_DEPENDS+= bin/nhc98::lang/nhc98
BUILD_DEPENDS+= ::lang/nhc98
MAKE_FLAGS= HC=nhc98
.endif
@ -26,7 +26,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/idoc/
do-regress:
(cd ${WRKSRC}/test && ../idoc Foo.hs && /usr/bin/lynx --dump Foo.html)
cd ${WRKSRC}/test && ../idoc Foo.hs && /usr/bin/lynx --dump Foo.html
# GPL
PERMIT_PACKAGE_CDROM= Yes

6
editors/kile/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2006/10/15 19:20:20 steven Exp $
# $OpenBSD: Makefile,v 1.7 2006/11/20 13:07:19 espie Exp $
COMMENT= "integrated LaTeX environment for KDE"
DISTNAME= kile-1.9.2
@ -23,8 +23,8 @@ WANTLIB= X11 Xext Xrender ICE SM c m pthread stdc++ util z \
LIB_DEPENDS= DCOP,kabc,katepartinterfaces.>=1,kdecore.>=4,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kresources,kspell.>=7,ktexteditor.>=1,kutils,kwalletclient,vcard::x11/kde/libs3
RUN_DEPENDS= kdvi,kpdf::x11/kde/graphics3 \
latex::print/teTeX/base
RUN_DEPENDS= ::x11/kde/graphics3 \
::print/teTeX/base
MODULES= x11/kde devel/gettext

4
emulators/xmame/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2006/08/18 17:09:23 kurt Exp $
# $OpenBSD: Makefile,v 1.26 2006/11/20 13:07:20 espie Exp $
COMMENT= "emulates arcade machines and old home computers"
COMMENT-mame= "emulates a massive variety of arcade machines"
@ -87,7 +87,7 @@ MAKE_FLAGS+= SOUND_ESOUND=1
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
. if ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= nasm::devel/nasm
BUILD_DEPENDS+= ::devel/nasm
MAKE_FLAGS+= X86_ASM_68000=1 \
EFFECT_MMX_ASM=1
. endif

6
lang/ghc/ghc.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: ghc.port.mk,v 1.4 2006/07/30 13:21:38 alek Exp $
# $OpenBSD: ghc.port.mk,v 1.5 2006/11/20 13:07:20 espie Exp $
# Module for Glasgow Haskell Compiler
# Not yet ported to other architectures
@ -6,10 +6,10 @@
ONLY_FOR_ARCHS= i386 amd64
# sparc
BUILD_DEPENDS+= bin/ghc::lang/ghc
BUILD_DEPENDS+= ::lang/ghc
# Only add runtime when it is actually needed (by default yes)
MODGHC_RUNTIME?=Yes
.if ${MODGHC_RUNTIME:L} == "yes"
RUN_DEPENDS+= bin/ghc::lang/ghc
RUN_DEPENDS+= ::lang/ghc
.endif

4
misc/migrationtools/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2004/11/11 18:36:52 naddy Exp $
# $OpenBSD: Makefile,v 1.7 2006/11/20 13:07:20 espie Exp $
COMMENT= "perl scripts for migrating system information to LDAP"
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
RUN_DEPENDS= openldap:openldap-client-*:databases/openldap
RUN_DEPENDS= :openldap-client-*:databases/openldap
NO_BUILD= Yes
NO_REGRESS= Yes

4
net/coccinella/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2006/02/08 04:54:49 david Exp $
# $OpenBSD: Makefile,v 1.4 2006/11/20 13:07:20 espie Exp $
COMMENT= "Jabber client with whiteboard communication"
@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=coccinella/}
RUN_DEPENDS= wish8.4::x11/tk/8.4
RUN_DEPENDS= ::x11/tk/8.4
USE_X11= Yes
NO_BUILD= Yes

4
net/nagios/nrpe/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2006/07/20 05:00:24 david Exp $
# $OpenBSD: Makefile,v 1.5 2006/11/20 13:07:20 espie Exp $
COMMENT= "Nagios Remote Plugin Executor"
@ -17,7 +17,7 @@ WANTLIB= c crypto ssl wrap
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
RUN_DEPENDS= nagios-plugins::net/nagios/plugins
RUN_DEPENDS= ::net/nagios/plugins
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+=--enable-command-args

4
security/hs-crypto/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2004/08/10 08:23:37 xsa Exp $
# $OpenBSD: Makefile,v 1.3 2006/11/20 13:07:20 espie Exp $
COMMENT= "Haskell cryptographic library"
CATEGORIES= security
@ -20,7 +20,7 @@ MAKE_ENV+= "WRKDIST=${WRKDIST}"
ALL_TARGET=
do-regress:
@(cd ${WRKDIST} ; /bin/sh test.sh)
@cd ${WRKDIST} ; /bin/sh test.sh
# 3 different licenses from 3 authors: BSD, GPL, BSD-ish
PERMIT_PACKAGE_CDROM= Yes

3
www/mod_auth_mysql/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2006/08/04 00:10:42 espie Exp $
# $OpenBSD: Makefile,v 1.9 2006/11/20 13:07:20 espie Exp $
COMMENT= "Apache MySQL authentication module"
@ -22,7 +22,6 @@ PERMIT_DISTFILES_CDROM= "no license"
PERMIT_DISTFILES_FTP= "no license"
LIB_DEPENDS= lib/mysql/mysqlclient.>=10::databases/mysql
BUILD_DEPENDS= ${LIB_DEPENDS}
NO_REGRESS= Yes

6
www/p5-Catalyst-Runtime/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2006/11/14 10:22:12 espie Exp $
# $OpenBSD: Makefile,v 1.6 2006/11/20 13:07:20 espie Exp $
COMMENT= "MVC Web Application Framework"
MODULES= cpan
DISTNAME= Catalyst-Runtime-5.7005
PKGNAME= p5-${DISTNAME}p0
PKGNAME= p5-${DISTNAME}p1
CATEGORIES= www
HOMEPAGE= http://www.catalystframework.org/
@ -30,7 +30,7 @@ RUN_DEPENDS= ::devel/p5-Class-Accessor \
::www/p5-CGI-Simple \
::www/p5-HTTP-Body \
::www/p5-HTTP-Request-AsCGI \
p5-libwww->=5.805::www/p5-libwww
:p5-libwww->=5.805:www/p5-libwww
MAKE_ENV= TEST_POD=Yes

4
x11/cwm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2006/11/13 13:01:37 steven Exp $
# $OpenBSD: Makefile,v 1.5 2006/11/20 13:07:20 espie Exp $
COMMENT= "calm window manager"
DISTNAME= cwm-3
@ -7,7 +7,7 @@ MASTER_SITES= ${HOMEPAGE}
HOMEPAGE= http://monkey.org/~marius/cwm/
BUILD_DEPENDS= pkgconfig-*::devel/pkgconfig
BUILD_DEPENDS= ::devel/pkgconfig
# BSD
PERMIT_DISTFILES_CDROM= Yes

5
x11/gromit/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2006/11/13 13:01:37 steven Exp $
# $OpenBSD: Makefile,v 1.8 2006/11/20 13:07:20 espie Exp $
COMMENT= "small tool to make annotations on the screen"
@ -27,8 +27,7 @@ WANTLIB= c freetype X11 m fontconfig \
MASTER_SITES= ${HOMEPAGE}
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \
${LIB_DEPENDS}
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
USE_X11= Yes
NO_REGRESS= Yes

5
x11/gtkglarea/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2006/07/20 04:43:28 steven Exp $
# $OpenBSD: Makefile,v 1.26 2006/11/20 13:07:20 espie Exp $
COMMENT= "OpenGL widget for GTK+ GUI toolkit"
@ -8,8 +8,7 @@ SHARED_LIBS= gtkgl 1.2
CATEGORIES= x11 graphics
MASTER_SITES= http://www.student.oulu.fi/~jlof/gtkglarea/download/
BUILD_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+
RUN_DEPENDS= ${BUILD_DEPENDS}
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+
# LGPL
PERMIT_PACKAGE_CDROM= Yes