diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2004-05-16 22:09:12 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2004-05-16 22:09:12 +0000 |
commit | 0e86be7e33b02cbeddc839d61ff353bb417ca1bc (patch) | |
tree | 65d16e748b097c7ebcdd73218c400eca16bd73d3 /multimedia/mpeg4ip | |
parent | After repocopy from audio/traymp, add gmpc, a tray-aware GTK2-client for MPD, (diff) |
- faad have been teached to live along us, what worse, we're now a dependency
for faad, so emove conflicts.
Reported by: Kay Lehmann <kay_lehmann@web.de>
Notes
Notes:
svn path=/head/; revision=109299
Diffstat (limited to 'multimedia/mpeg4ip')
-rw-r--r-- | multimedia/mpeg4ip/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index 546500c23ad5..8b89081156fd 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -30,8 +30,6 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" INSTALLS_SHLIB= yes -CONFLICTS= faad* - DOC_FILES= COPYING README doc/MPEG4IP_Guide.pdf PORTDOCS= COPYING MPEG4IP_Guide.pdf README |