diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile index fd05a1850366..5410d9c43e06 100644 --- a/audio/libtunepimp-old/Makefile +++ b/audio/libtunepimp-old/Makefile @@ -21,6 +21,7 @@ LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \ expat:${PORTSDIR}/textproc/expat2 \ musicbrainz:${PORTSDIR}/audio/libmusicbrainz +CONFLICTS= trm-0* USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_REINPLACE= yes diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile index fd05a1850366..5410d9c43e06 100644 --- a/audio/libtunepimp/Makefile +++ b/audio/libtunepimp/Makefile @@ -21,6 +21,7 @@ LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \ expat:${PORTSDIR}/textproc/expat2 \ musicbrainz:${PORTSDIR}/audio/libmusicbrainz +CONFLICTS= trm-0* USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_REINPLACE= yes diff --git a/audio/trm/Makefile b/audio/trm/Makefile index d2800ee9a841..c89cdc5c12a9 100644 --- a/audio/trm/Makefile +++ b/audio/trm/Makefile @@ -21,6 +21,9 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \ musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ vorbisfile.4:${PORTSDIR}/audio/libvorbis +CONFLICTS= libtunepimp-* +DEPRECATED= "Use libtunepimp instead" +EXPIRATION_DATE= 2004-12-31 USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes