Date: Tue, 12 Sep 2006 10:13:36 +0300 From: Vasil Dimov <vd@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: timur@gnu.org, portmgr@FreeBSD.org Subject: ports/103178: [repocopy] net/samba3 -> net/samba Message-ID: <20060912071336.GA48396@qlovarnika.bg.datamax> Resent-Message-ID: <200609120720.k8C7KLER090096@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 103178
>Category: ports
>Synopsis: [repocopy] net/samba3 -> net/samba
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 12 07:20:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Vasil Dimov
>Release: FreeBSD 6.1-STABLE amd64
>Organization:
N/A
>Environment:
>Description:
Since net/samba (version 2) got purged we can rename net/samba3 to
net/samba.
>How-To-Repeat:
>Fix:
In addition the following patch must be applied:
--- samba-repo.diff begins here ---
Index: emulators/qemu/Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.56
diff -u -r1.56 Makefile
--- emulators/qemu/Makefile 25 Aug 2006 21:16:20 -0000 1.56
+++ emulators/qemu/Makefile 12 Sep 2006 06:47:11 -0000
@@ -27,7 +27,7 @@
BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html
.if defined(WITH_SAMBA)
-RUN_DEPENDS+= ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba3
+RUN_DEPENDS+= ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba
.endif
.if defined(WITH_KQEMU)
BUILD_DEPENDS+= kqemu-kmod>=1.3.0pre5:${PORTSDIR}/emulators/kqemu-kmod
Index: japanese/samba3/Makefile
===================================================================
RCS file: /home/pcvs/ports/japanese/samba3/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- japanese/samba3/Makefile 7 Sep 2006 00:51:16 -0000 1.17
+++ japanese/samba3/Makefile 12 Sep 2006 06:47:11 -0000
@@ -19,7 +19,7 @@
CONFLICTS= ja-samba-2.* samba-2.* samba-3.0.* sharity-light-1.*
-SAMBA_PORT= samba3
+SAMBA_PORT= samba
MASTERDIR= ${.CURDIR}/../../net/${SAMBA_PORT}
MD5_FILE= ${.CURDIR}/distinfo
Index: misc/amanda-server/Makefile
===================================================================
RCS file: /home/pcvs/ports/misc/amanda-server/Makefile,v
retrieving revision 1.92
diff -u -r1.92 Makefile
--- misc/amanda-server/Makefile 2 Sep 2006 19:50:46 -0000 1.92
+++ misc/amanda-server/Makefile 12 Sep 2006 06:47:11 -0000
@@ -116,8 +116,8 @@
.endif
.if defined (WITH_SAMBA)
-BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/samba3
-RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba3
+BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/samba
+RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba
CONFIGURE_ARGS+= --with-smbclient=${PREFIX}/bin/smbclient
.endif
Index: misc/instant-server/Makefile
===================================================================
RCS file: /home/pcvs/ports/misc/instant-server/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- misc/instant-server/Makefile 2 Sep 2006 18:34:38 -0000 1.14
+++ misc/instant-server/Makefile 12 Sep 2006 06:47:11 -0000
@@ -18,7 +18,7 @@
RUN_DEPENDS= ${LOCALBASE}/sbin/postfix:${PORTSDIR}/mail/postfix \
${LOCALBASE}/sbin/cvsupd:${PORTSDIR}/net/cvsup \
${LOCALBASE}/sbin/dhcpd:${PORTSDIR}/net/isc-dhcp3-server \
- ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba3 \
+ ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba \
${LOCALBASE}/sbin/traceroute:${PORTSDIR}/net/traceroute \
cnewsdo:${PORTSDIR}/news/cnews \
${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT} \
Index: net-im/kpopup/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-im/kpopup/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- net-im/kpopup/Makefile 23 Feb 2006 10:38:32 -0000 1.12
+++ net-im/kpopup/Makefile 12 Sep 2006 06:47:11 -0000
@@ -16,7 +16,7 @@
MAINTAINER= itetcu@people.tecnik93.com
COMMENT= KDE program for sending and receiving MS Windows WinPopup messages
-RUN_DEPENDS= smbclient:${PORTSDIR}/net/samba3
+RUN_DEPENDS= smbclient:${PORTSDIR}/net/samba
SUB_FILES= pkg-message
Index: net-im/linpopup/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-im/linpopup/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- net-im/linpopup/Makefile 25 Aug 2006 08:30:06 -0000 1.14
+++ net-im/linpopup/Makefile 12 Sep 2006 06:47:11 -0000
@@ -15,7 +15,7 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= X11 port of WinPopup
-RUN_DEPENDS= ${LOCALBASE}/bin/smbclient:${PORTSDIR}/net/samba3
+RUN_DEPENDS= ${LOCALBASE}/bin/smbclient:${PORTSDIR}/net/samba
WRKSRC= ${WRKDIR}/LinPopUp-${PORTVERSION}/src
ALL_TARGET=
Index: net/lanbrowsing/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/lanbrowsing/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- net/lanbrowsing/Makefile 5 Jun 2006 19:24:19 -0000 1.14
+++ net/lanbrowsing/Makefile 12 Sep 2006 06:47:11 -0000
@@ -17,7 +17,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Lanbrowsing facility and backend for KDE
-RUN_DEPENDS= nmblookup:${PORTSDIR}/net/samba3
+RUN_DEPENDS= nmblookup:${PORTSDIR}/net/samba
CONFLICTS= kdenetwork-3.3.0
Index: net/linneighborhood/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/linneighborhood/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- net/linneighborhood/Makefile 25 Aug 2006 08:23:31 -0000 1.17
+++ net/linneighborhood/Makefile 12 Sep 2006 06:47:11 -0000
@@ -14,7 +14,7 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK+ gui for browsing and mounting SMB filesystems
-RUN_DEPENDS= smbclient:${PORTSDIR}/net/samba3
+RUN_DEPENDS= smbclient:${PORTSDIR}/net/samba
GNU_CONFIGURE= yes
USE_GETTEXT= yes
Index: net/samba-pdbsql/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/samba-pdbsql/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- net/samba-pdbsql/Makefile 3 Sep 2006 11:48:22 -0000 1.2
+++ net/samba-pdbsql/Makefile 12 Sep 2006 06:47:11 -0000
@@ -22,7 +22,7 @@
# Add a build dependency for Samba port
USE_AUTOTOOLS= autoconf:259 autoheader:259
-SAMBA_PORT= net/samba3
+SAMBA_PORT= net/samba
SAMBA_VERSION= 3.0.23
OPTIONS= MYSQL "With MySQL passdb backend" on \
Index: net/smb4k/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/smb4k/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- net/smb4k/Makefile 17 Apr 2006 16:43:05 -0000 1.8
+++ net/smb4k/Makefile 12 Sep 2006 06:47:11 -0000
@@ -14,7 +14,7 @@
COMMENT= KDE 3.x SMB Network browser and SMB shares mounting center
RUN_DEPENDS= sudo:${PORTSDIR}/security/sudo \
- smbstatus:${PORTSDIR}/net/samba3
+ smbstatus:${PORTSDIR}/net/samba
USE_KDEBASE_VER= 3
USE_GMAKE= yes
Index: net/xsmbrowser/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/xsmbrowser/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- net/xsmbrowser/Makefile 25 Aug 2006 08:26:08 -0000 1.13
+++ net/xsmbrowser/Makefile 12 Sep 2006 06:47:11 -0000
@@ -14,7 +14,7 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Tcl/Tk port of Windows' Network Neighborhood
-RUN_DEPENDS= ${LOCALBASE}/bin/smbclient:${PORTSDIR}/net/samba3 \
+RUN_DEPENDS= ${LOCALBASE}/bin/smbclient:${PORTSDIR}/net/samba \
${LOCALBASE}/bin/expectk:${PORTSDIR}/lang/expect
USE_PERL5_BUILD=yes
Index: print/apsfilter/Makefile
===================================================================
RCS file: /home/pcvs/ports/print/apsfilter/Makefile,v
retrieving revision 1.127
diff -u -r1.127 Makefile
--- print/apsfilter/Makefile 9 Jul 2006 16:34:49 -0000 1.127
+++ print/apsfilter/Makefile 12 Sep 2006 06:47:11 -0000
@@ -102,7 +102,7 @@
.endif
# all possible remote printing support
RUN_DEPENDS+= pap:${PORTSDIR}/net/netatalk
-RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba3
+RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba
.elif defined(BATCH)
#
# in normal batch/portbuilding mode (without building all)
Index: print/cups-samba/Makefile
===================================================================
RCS file: /home/pcvs/ports/print/cups-samba/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- print/cups-samba/Makefile 25 Aug 2006 08:33:45 -0000 1.5
+++ print/cups-samba/Makefile 12 Sep 2006 06:47:11 -0000
@@ -21,8 +21,8 @@
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 \
tardy:${PORTSDIR}/archivers/tardy \
${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups-base \
- smbspool:${PORTSDIR}/net/samba3
-RUN_DEPENDS= smbspool:${PORTSDIR}/net/samba3 \
+ smbspool:${PORTSDIR}/net/samba
+RUN_DEPENDS= smbspool:${PORTSDIR}/net/samba \
${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups-base \
espgs:${PORTSDIR}/print/cups-pstoraster
Index: print/cups-smb-backend/Makefile
===================================================================
RCS file: /home/pcvs/ports/print/cups-smb-backend/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- print/cups-smb-backend/Makefile 8 May 2006 21:41:08 -0000 1.2
+++ print/cups-smb-backend/Makefile 12 Sep 2006 06:47:11 -0000
@@ -14,7 +14,7 @@
MAINTAINER= infofarmer@FreeBSD.org
COMMENT= A CUPS backend for printing to Windows servers
-RUN_DEPENDS= smbspool:${PORTSDIR}/net/samba3 \
+RUN_DEPENDS= smbspool:${PORTSDIR}/net/samba \
${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups-base
NO_BUILD= yes
Index: security/saint/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/saint/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- security/saint/Makefile 3 Sep 2006 06:30:32 -0000 1.32
+++ security/saint/Makefile 12 Sep 2006 06:47:11 -0000
@@ -14,7 +14,7 @@
BUILD_DEPENDS= nmap:${PORTSDIR}/security/nmap
.if defined(WITH_SAMBA)
-BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/samba3
+BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/samba
.endif
BROKEN= Unfetchable
Index: security/samba-vscan/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/samba-vscan/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- security/samba-vscan/Makefile 5 Apr 2006 21:04:29 -0000 1.10
+++ security/samba-vscan/Makefile 12 Sep 2006 06:47:11 -0000
@@ -33,7 +33,7 @@
USE_AUTOTOOLS= autoconf:259
USE_BZIP2= yes
-VSCAN_SAMBA_PORT?= samba3
+VSCAN_SAMBA_PORT?= samba
SAMBA_WRKSRC!= cd ${.CURDIR}/../../net/${VSCAN_SAMBA_PORT}; ${MAKE} -V WRKSRC
HAS_CONFIGURE= yes
USE_GMAKE= yes
@@ -51,7 +51,7 @@
EXTRA_PATCHES=${FILESDIR}/extra_patch-*
.endif
-.if ${VSCAN_SAMBA_PORT} != "samba3"
+.if ${VSCAN_SAMBA_PORT} != "samba"
VFSDIR=lib/samba
.endif
@@ -126,7 +126,7 @@
PLIST_DIRS= ${ETCDIR} ${VFSDIR}
pre-configure:
-.if ${VSCAN_SAMBA_PORT} == "samba3"
+.if ${VSCAN_SAMBA_PORT} == "samba"
@cd ${SAMBA_WRKSRC}; make proto 2>&1 > /dev/null
.endif
Index: www/elinks/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/elinks/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- www/elinks/Makefile 21 Aug 2006 15:40:56 -0000 1.40
+++ www/elinks/Makefile 12 Sep 2006 06:47:12 -0000
@@ -111,8 +111,8 @@
.endif
.if defined(WITH_SMB)
-RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba3
-BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/samba3
+RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba
+BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/samba
CONFIGURE_ARGS+= --enable-smb
.else
CONFIGURE_ARGS+= --disable-smb
Index: www/smb2www/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/smb2www/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- www/smb2www/Makefile 25 Aug 2006 08:35:33 -0000 1.11
+++ www/smb2www/Makefile 12 Sep 2006 06:47:12 -0000
@@ -17,7 +17,7 @@
COMMENT= Windows Network client that is accessible through a web browser
RUN_DEPENDS= httpd:${PORTSDIR}/${APACHE_PORT} \
- smbclient:${PORTSDIR}/net/samba3 \
+ smbclient:${PORTSDIR}/net/samba \
${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
IS_INTERACTIVE= yes
Index: www/smb_auth/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/smb_auth/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- www/smb_auth/Makefile 9 Jul 2006 08:07:06 -0000 1.13
+++ www/smb_auth/Makefile 12 Sep 2006 06:47:12 -0000
@@ -20,7 +20,7 @@
.endif
ALL_TARGET= smb_auth
-SAMBA_PORT?= net/samba3
+SAMBA_PORT?= net/samba
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/smb_auth ${PREFIX}/bin
--- samba-repo.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060912071336.GA48396>