diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-05-02 07:44:47 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-05-02 07:44:47 +0800 |
| commit | 8c7c8f7fd5f4871bdc3c654c9067d924b7c77b91 (patch) | |
| tree | 0a242b769058c7114b7fd94d2c2dbd4fe46abcf9 | |
| parent | 6c01330235d9e5a0c5cb0520f93d766342fe168d (diff) | |
| download | marcuscom-ports-8c7c8f7fd5f4871bdc3c654c9067d924b7c77b91.tar marcuscom-ports-8c7c8f7fd5f4871bdc3c654c9067d924b7c77b91.tar.gz marcuscom-ports-8c7c8f7fd5f4871bdc3c654c9067d924b7c77b91.tar.bz2 marcuscom-ports-8c7c8f7fd5f4871bdc3c654c9067d924b7c77b91.tar.lz marcuscom-ports-8c7c8f7fd5f4871bdc3c654c9067d924b7c77b91.tar.xz marcuscom-ports-8c7c8f7fd5f4871bdc3c654c9067d924b7c77b91.tar.zst marcuscom-ports-8c7c8f7fd5f4871bdc3c654c9067d924b7c77b91.zip | |
Fix the CONFLICTS.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15940 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | games/gnome-games/Makefile | 6 | ||||
| -rw-r--r-- | games/gnome-games3/Makefile | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index f1cb043e8..f86623180 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/games/gnome-games/Makefile,v 1.234 2011/04/22 16:01:45 mezz Exp $ +# $MCom: ports/games/gnome-games/Makefile,v 1.235 2011/04/30 20:43:17 mezz Exp $ # PORTNAME= gnome-games @@ -22,7 +22,7 @@ LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile \ clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter RUN_DEPENDS= seed:${PORTSDIR}/devel/seed -CONFLICTS= gnome-games-3.[0-9]* +CONFLICTS= sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* gnome-games-3.[0-9]* USE_BZIP2= yes USE_PYTHON= yes @@ -45,8 +45,6 @@ GCONF_SCHEMAS= aisleriot.schemas glchess.schemas glines.schemas \ gnotski.schemas gtali.schemas iagno.schemas lightsoff.schemas \ mahjongg.schemas quadrapassel.schemas swell-foop.schemas -CONFLICTS= sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* - #DSC_FILES= iagno/iagno-client.dsc gnect/data/gnect-client.dsc \ # gnibbles/gnibbles-client.dsc diff --git a/games/gnome-games3/Makefile b/games/gnome-games3/Makefile index aa89e9bc6..4b56856e4 100644 --- a/games/gnome-games3/Makefile +++ b/games/gnome-games3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/games/gnome-games3/Makefile,v 1.10 2011/04/21 09:25:35 kwm Exp $ +# $MCom: ports/games/gnome-games3/Makefile,v 1.11 2011/04/22 16:01:45 mezz Exp $ # PORTNAME= gnome-games @@ -25,7 +25,7 @@ LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile \ clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter #RUN_DEPENDS= seed:${PORTSDIR}/devel/seed -CONFLICTS= gnome-games-2.[0-9]* +CONFLICTS= sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* gnome-games-2.[0-9]* USE_BZIP2= yes USE_PYTHON= yes @@ -53,8 +53,6 @@ GCONF_SCHEMAS= aisleriot.schemas glines.schemas \ GLIB_SCHEMAS= org.gnome.Games.WindowState.gschema.xml \ org.gnome.glchess.gschema.xml -CONFLICTS= sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* - MAN6= glchess.6 glines.6 gnect.6 gnibbles.6 gnobots2.6 \ gnomine.6 gnotravex.6 gnotski.6 \ gtali.6 iagno.6 mahjongg.6 quadrapassel.6 sol.6 |