diff options
| author | garga <garga@FreeBSD.org> | 2009-02-25 21:49:58 +0800 |
|---|---|---|
| committer | garga <garga@FreeBSD.org> | 2009-02-25 21:49:58 +0800 |
| commit | ce8999dc84b26325949c900ee3641f1afd64e858 (patch) | |
| tree | 130fb982defcf427c41b876b72a8b7fbc194d842 /multimedia | |
| parent | 9de4189346025478b712e21d2588d0fde64556e1 (diff) | |
| download | freebsd-ports-gnome-ce8999dc84b26325949c900ee3641f1afd64e858.tar.gz freebsd-ports-gnome-ce8999dc84b26325949c900ee3641f1afd64e858.tar.zst freebsd-ports-gnome-ce8999dc84b26325949c900ee3641f1afd64e858.zip | |
- Fix CONFLICTS, the mask used conflict the port with cclive, and they can
co-exist
- Remove pkg-plist file, since Makefile has PLIST_FILES line
PR: ports/132031
Submitted by: maintainer
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/clive/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/clive/pkg-plist | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile index bed8ae866442..b230816ad1d8 100644 --- a/multimedia/clive/Makefile +++ b/multimedia/clive/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= p5-BerkeleyDB>=0.36:${PORTSDIR}/databases/p5-BerkeleyDB \ p5-XML-Simple>=2.18:${PORTSDIR}/textproc/p5-XML-Simple # deskutils/ljclive, multimedia/clive1 (same executable/manpage/distfile name) -CONFLICTS= *clive-[0-1]* +CONFLICTS= clive-[0-1]* ljclive-[0-9]* OPTIONS= PASTE "Enable pasting from X clipboard" off \ PAGER "Enable pager for viewing cache entries" off \ diff --git a/multimedia/clive/pkg-plist b/multimedia/clive/pkg-plist deleted file mode 100644 index 99e25ca6e4c3..000000000000 --- a/multimedia/clive/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -@comment $FreeBSD$ -bin/clive |