diff options
| author | lioux <lioux@FreeBSD.org> | 2006-09-29 06:58:29 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2006-09-29 06:58:29 +0800 |
| commit | 05e4c7676406d679376d87225154dc7dadca1a33 (patch) | |
| tree | c5091aa2f660fd4ab388febae69e1ee813f2a03e /net-p2p | |
| parent | f06557bc54a9db3be7eab20fed5d5b28ab998ab3 (diff) | |
| download | freebsd-ports-gnome-05e4c7676406d679376d87225154dc7dadca1a33.tar.gz freebsd-ports-gnome-05e4c7676406d679376d87225154dc7dadca1a33.tar.zst freebsd-ports-gnome-05e4c7676406d679376d87225154dc7dadca1a33.zip | |
o Fix graphics/gd dependency
o Bump PORTREVISION
PR: 103410
Submitted by: Marcin Wisnicki <mwisnicki+freebsd@gmail.com>
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/mldonkey-devel/Makefile | 17 | ||||
| -rw-r--r-- | net-p2p/mldonkey-devel/pkg-plist | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile index 5a5e9ada6501..f7105d28b6f7 100644 --- a/net-p2p/mldonkey-devel/Makefile +++ b/net-p2p/mldonkey-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= mldonkey PORTVERSION= 2.8.1 +PORTREVISION= 1 CATEGORIES+= net-p2p MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} \ ${MASTER_SITE_SAVANNAH} @@ -54,8 +55,7 @@ LIB_DEPENDS+= bz2:${PORTSDIR}/archivers/bzip2 IGNORE= cannot install: you defined both WITHOUT_GUI and WITHOUT_CORE. I think I'll do nothing .endif # have no 'without-' flag -CONFIGURE_ARGS+=--disable-gui \ - --disable-gd +CONFIGURE_ARGS+=--disable-gui PLIST_SUB+= CORE="" GUI="@comment " GUICORE="@comment " CONFLICTS+= mldonkey-core-[0.9]* mldonkey-core-stable-[0.9]* \ mldonkey-devel-[0-9]* @@ -66,10 +66,8 @@ CONFLICTS+= mldonkey-gui-[0.9]* .if !defined(WITHOUT_CORE) CONFLICTS+= mldonkey-devel-[0-9]* .endif -BUILD_DEPENDS+= ${LOCALBASE}/lib/ocaml/lablgtk2/lablrsvg.cma:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \ - ${LOCALBASE}/lib/ocaml/jabbr.cma:${PORTSDIR}/net-im/ocaml-jabbr -LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd \ - rsvg-2.2:${PORTSDIR}/graphics/librsvg2 +BUILD_DEPENDS+= ${LOCALBASE}/lib/ocaml/lablgtk2/lablrsvg.cma:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 +LIB_DEPENDS+= rsvg-2.2:${PORTSDIR}/graphics/librsvg2 CONFIGURE_ARGS+=--enable-gui=newgui2 # we don't need lablgtk as RUN dependency, but we need gtk+glib @@ -83,6 +81,11 @@ PLIST_SUB+= CORE="@comment " GUICORE="@comment " PLIST_SUB+= CORE="" GUICORE="" .endif .endif +.if defined(WITHOUT_GD) +CONFIGURE_ARGS+=--disable-gd +.elif !defined(WITHOUT_CORE) +LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd +.endif DOCFILES= Authors.txt Bugs.txt ChangeLog Developers.txt FAQ.html \ Install.txt Readme.txt Todo.txt ed2k_links.txt @@ -170,9 +173,7 @@ do-install: @${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey ${EXAMPLESDIR} .endif .ifndef(WITHOUT_GUI) - @${INSTALL_PROGRAM} ${WRKSRC}/mlchat ${PREFIX}/bin @${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/mlim ${PREFIX}/bin .endif .ifndef(WITHOUT_CORE && WITHOUT_GUI) @${INSTALL_SCRIPT} ${WRKSRC}/distrib/mldonkey_previewer ${PREFIX}/bin diff --git a/net-p2p/mldonkey-devel/pkg-plist b/net-p2p/mldonkey-devel/pkg-plist index b9af7d87b461..8085bd443fea 100644 --- a/net-p2p/mldonkey-devel/pkg-plist +++ b/net-p2p/mldonkey-devel/pkg-plist @@ -5,7 +5,5 @@ %%GUICORE%%bin/mlguistarter %%GUICORE%%bin/mldonkey_previewer %%GUICORE%%bin/mlnet+gui -%%GUI%%bin/mlchat %%GUI%%bin/mlgui -%%GUI%%bin/mlim %%CORE%%@dirrm %%EXAMPLESDIR%% |