diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-10-11 04:42:43 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-10-11 04:42:43 +0000 |
| commit | 2481c943622ce84d236a1247651715cfdfb76d18 (patch) | |
| tree | 097621c100a6a50ec7eeb6fe0a525893f0ea7cb0 | |
| parent | anjuta and anjuta-devel conflict with each other. (diff) | |
gcompris and gcompris2 conflict with each other.
Submitted by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Notes
Notes:
svn path=/head/; revision=90826
Diffstat (limited to '')
| -rw-r--r-- | games/gcompris/Makefile | 2 | ||||
| -rw-r--r-- | games/gcompris2/Makefile | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index e756fc99e55a..9e3e719515f9 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -26,6 +26,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFLICTS= gcompris2* + post-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile index 795138e8ce78..4ec85dcaec5b 100644 --- a/games/gcompris2/Makefile +++ b/games/gcompris2/Makefile @@ -28,4 +28,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ INFO= gcompris +CONFLICTS= gcompris-* + .include <bsd.port.mk> |