aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authordwcjr <dwcjr@FreeBSD.org>2002-02-08 01:01:23 +0800
committerdwcjr <dwcjr@FreeBSD.org>2002-02-08 01:01:23 +0800
commit6ba6addcc1285f017967a6cac8cac3c13de13e48 (patch)
treea35e2e0ded9c346d43ba3f5f609649ea4041cd12 /net
parentc3bb091dbaa7ea6ae13cef35dc40b1c77b1b8133 (diff)
downloadfreebsd-ports-gnome-6ba6addcc1285f017967a6cac8cac3c13de13e48.tar.gz
freebsd-ports-gnome-6ba6addcc1285f017967a6cac8cac3c13de13e48.tar.zst
freebsd-ports-gnome-6ba6addcc1285f017967a6cac8cac3c13de13e48.zip
Update to 2.2.3a
Finally settle on a fix for CUPS dependency PR: 34683 Submitted by: maintainer, ports@geeksrus.net
Diffstat (limited to 'net')
-rw-r--r--net/samba/Makefile14
-rw-r--r--net/samba/distinfo2
2 files changed, 9 insertions, 7 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index abafb46cb400..77e15944185f 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= samba
-PORTVERSION= 2.2.3
+PORTVERSION= 2.2.3a
CATEGORIES= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
@@ -17,10 +17,6 @@ MASTER_SITE_SUBDIR= . old-versions old
MAINTAINER= dwcjr@FreeBSD.org
-.if defined(WITH_CUPS)
-LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base
-.endif
-
.if defined(WITH_RECYCLE)
PATCH_SITES+= http://www.amherst.edu/~bbstone/recycle_bin/2.2.2/
PATCHFILES+= proto.h.patch loadparm.c.patch reply.c.patch
@@ -45,9 +41,15 @@ CONFIGURE_ARGS= --libdir=${SAMBA_CONFDIR} \
.include <bsd.port.pre.mk>
-# to find CUPS libs, includes
+.if !defined(WITHOUT_CUPS)
+WITH_CUPS= yes
+.endif
+
+.if defined(WITH_CUPS)
+LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base
CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
+.endif
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
CONFIGURE_ARGS+= --with-krb5=${KRB5_HOME}
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 9d8330214518..edc9fee4fb46 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,4 +1,4 @@
-MD5 (samba-2.2.3.tar.gz) = 618e679e84923b958f18e7d50c09bc1a
+MD5 (samba-2.2.3a.tar.gz) = b6ec2f076af69331535a82b586f55254
MD5 (proto.h.patch) = b8b577540c1de5202e70584a402c2d74
MD5 (loadparm.c.patch) = df642726476af756df8a2e6c0537eb0d
MD5 (reply.c.patch) = fcc861e805f74ec610ba44ab5cc9f1b7