summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/samba/Makefile4
-rw-r--r--net/samba/hacks.mk8
-rw-r--r--net/samba33/Makefile3
-rw-r--r--net/samba33/hacks.mk3
4 files changed, 15 insertions, 3 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index ab9f52d176d..ae675bf80e2 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.197 2010/02/09 16:08:35 drochner Exp $
+# $NetBSD: Makefile,v 1.198 2010/03/08 22:19:07 jmmv Exp $
.include "Makefile.mirrors"
DISTNAME= samba-${VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
diff --git a/net/samba/hacks.mk b/net/samba/hacks.mk
new file mode 100644
index 00000000000..f72242a513f
--- /dev/null
+++ b/net/samba/hacks.mk
@@ -0,0 +1,8 @@
+# $NetBSD: hacks.mk,v 1.1 2010/03/08 22:19:07 jmmv Exp $
+
+# Enabling PIE results in a 'Unsupported relocation type 6 in non-PLT
+# relocations' error under NetBSD/macppc.
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
+PKG_HACKS+= pie
+CONFIGURE_ARGS+= --disable-pie
+.endif
diff --git a/net/samba33/Makefile b/net/samba33/Makefile
index 2c9032ab70d..80951b566de 100644
--- a/net/samba33/Makefile
+++ b/net/samba33/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/03/02 14:56:22 taca Exp $
+# $NetBSD: Makefile,v 1.5 2010/03/08 22:19:07 jmmv Exp $
.include "../../net/samba/Makefile.mirrors"
DISTNAME= samba-${VERSION}
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
diff --git a/net/samba33/hacks.mk b/net/samba33/hacks.mk
new file mode 100644
index 00000000000..35cfae378c8
--- /dev/null
+++ b/net/samba33/hacks.mk
@@ -0,0 +1,3 @@
+# $NetBSD: hacks.mk,v 1.1 2010/03/08 22:19:07 jmmv Exp $
+
+.include "../../net/samba/hacks.mk"