mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00
Code Issues Releases Activity

Fix up some conflicts issues: there was an edge case where samba-devel

Browse Source 
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
This commit is contained in:
Mark Linimon 2004-03-10 07:46:51 +00:00
parent 26b0d5c789
commit 7d04f9f55e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=103501
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
japanese/linux-JM/Makefile
View File

@ -35,7 +35,7 @@ MANPAGES_OTHERS= \
mpg123 \
ncftp netatalk \
rdate \
smbfs sudo \
sudo \
uudeview \
wu-ftpd

2
net/samba-devel/Makefile
View File

@ -28,7 +28,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/:S/.a/a/}
MAINTAINER= timur@gnu.org
COMMENT= A free SMB and CIFS client and server for UNIX
CONFLICTS= ja-samba-2.* samba-3.* sharity-light-1.* samba-libsmbclient-3.*
CONFLICTS= ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.*
OPTIONS= CUPS "With CUPS printing support" on \
LDAP "With LDAP support" on \

2
net/samba3/Makefile
View File

@ -28,7 +28,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/:S/.a/a/}
MAINTAINER= timur@gnu.org
COMMENT= A free SMB and CIFS client and server for UNIX
CONFLICTS= ja-samba-2.* samba-3.* sharity-light-1.* samba-libsmbclient-3.*
CONFLICTS= ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.*
OPTIONS= CUPS "With CUPS printing support" on \
LDAP "With LDAP support" on \