diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2004-03-10 07:46:51 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2004-03-10 07:46:51 +0000 |
| commit | 7d04f9f55e5d81d710aa5c773f39e7048cf3477c (patch) | |
| tree | f295e2ecaa87276b78d5be8748aac35ab378baa2 /japanese | |
| parent | Update to 2.5.8. (diff) | |
Fix up some conflicts issues: there was an edge case where samba-devel
conflicted with itself (only shows up in edge cases); there was a case
where two ports in japanese/ installed smbfs man pages -- but one
installed very old ones. This seems to be the best conclusion from
the following convoluted PR:
PR: ports/59599
Submitted by: Koop Mast <einekoai@chello.nl>
Reviewed by: eik, trevor, dwcjr, nakaji, at various times
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/linux-JM/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/japanese/linux-JM/Makefile b/japanese/linux-JM/Makefile index 209d6bc397fe..c5529e8488b9 100644 --- a/japanese/linux-JM/Makefile +++ b/japanese/linux-JM/Makefile @@ -35,7 +35,7 @@ MANPAGES_OTHERS= \ mpg123 \ ncftp netatalk \ rdate \ - smbfs sudo \ + sudo \ uudeview \ wu-ftpd |