aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authordinoex <dinoex@FreeBSD.org>2004-10-04 03:47:28 +0800
committerdinoex <dinoex@FreeBSD.org>2004-10-04 03:47:28 +0800
commitf9b06e716c643d3fcddea363d4c15a64c61736a3 (patch)
tree02cb7a9b46621a94036aa732778183e9ff8c9150 /net
parentd9a3808d685defab6809ae302819425d9d8c53a3 (diff)
downloadfreebsd-ports-gnome-f9b06e716c643d3fcddea363d4c15a64c61736a3.tar.gz
freebsd-ports-gnome-f9b06e716c643d3fcddea363d4c15a64c61736a3.tar.zst
freebsd-ports-gnome-f9b06e716c643d3fcddea363d4c15a64c61736a3.zip
- add option WITH_INCLUDED_POPT
Submitted by: Victor Sudakov - Security Update to 2.2.12 CAN-2004-0815 PR: 72199 Submitted by: Dmitry A Grigorovich Approved by: portmgr (marcus)
Diffstat (limited to 'net')
-rw-r--r--net/samba/Makefile7
-rw-r--r--net/samba/distinfo4
2 files changed, 7 insertions, 4 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index bc259ec56975..0b2cbb44a70f 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= samba
-PORTVERSION= 2.2.11
-PORTREVISION= 1
+PORTVERSION= 2.2.12
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR= . old-versions
@@ -113,7 +112,11 @@ CONFIGURE_ARGS+= --with-utmp
CONFIGURE_ARGS+= --with-msdfs
.endif
+.if defined(WITH_INCLUDED_POPT)
+CONFIGURE_ARGS+= --with-included-popt
+.else
LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt
+.endif
.if defined(WITH_LDAP)
USE_OPENLDAP= yes
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 7a2609c67555..3782df7af04c 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,5 +1,5 @@
-MD5 (samba-2.2.11.tar.gz) = 3aa08a4821fd1ba03b603ac2ff4bf071
-SIZE (samba-2.2.11.tar.gz) = 5503252
+MD5 (samba-2.2.12.tar.gz) = ffda6f5a93635d0b2afb2b2fb17e3bbf
+SIZE (samba-2.2.12.tar.gz) = 5459704
MD5 (samba-2.2.10-freebsd-jail-patch-20040806.gz) = c38006077a83bb28ae7672df477834b2
SIZE (samba-2.2.10-freebsd-jail-patch-20040806.gz) = 2959
MD5 (samba-2.2.9-browsing-hacks.diff) = 39f95cdb2f9833b4eec7a05000fe2cbf