aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroam <roam@FreeBSD.org>2005-11-25 00:04:38 +0800
committerroam <roam@FreeBSD.org>2005-11-25 00:04:38 +0800
commitacdabcc1e19812c3309d3899a042551e7b1ac67a (patch)
tree238c6fa1a2aabd3a1711fe2bf465388221739506
parent6b4d9f01fc69b8c543544f140f5f904c2f18c7bb (diff)
downloadfreebsd-ports-gnome-acdabcc1e19812c3309d3899a042551e7b1ac67a.tar.gz
freebsd-ports-gnome-acdabcc1e19812c3309d3899a042551e7b1ac67a.tar.zst
freebsd-ports-gnome-acdabcc1e19812c3309d3899a042551e7b1ac67a.zip
Only use -fPIC on amd64 - none of the other arches seem to need it.
Unfortunately, the only way to avoid adding -fPIC to the files that go into libvpopmail.a would be to actually make the vpopmail port build a real shared library, which might be a bit more difficult and should probably be coordinated with the upstream. Pointy hat to: roam (myself) Pointy hat handed by: kris
-rw-r--r--mail/vpopmail/Makefile10
-rw-r--r--mail/vpopmail/files/patch-configure15
2 files changed, 18 insertions, 7 deletions
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index b75208285bff..537b99c05f42 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vpopmail
PORTVERSION= 5.4.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -133,10 +133,6 @@ RELAYCLEAR?= 30
SPAM_THRESHOLD?=15
LOGLEVEL?= y
-.if !defined(WITHOUT_FPIC)
-CFLAGS+= -fPIC
-.endif
-
.if defined(WITH_LDAP)
USE_OPENLDAP= yes
.if defined(WITH_LDAP_SASL)
@@ -208,6 +204,10 @@ QMAIL_DIR?= ${LOCALBASE}/qmail
QMAIL_DIR?= /var/qmail
.endif
+.if !defined(WITHOUT_FPIC) && ${ARCH} == "amd64"
+CFLAGS+= -fPIC
+.endif
+
# Uncomment this, or set PREFIX to /home if you have an existing
# vpopmail install with the vpopmail users' home directory set to
# /home/vpopmail - package rules dictate we default to /usr/local/vpopmail
diff --git a/mail/vpopmail/files/patch-configure b/mail/vpopmail/files/patch-configure
index 633f6f7fb945..5939fb3f59f1 100644
--- a/mail/vpopmail/files/patch-configure
+++ b/mail/vpopmail/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig Sun Mar 20 16:38:35 2005
-+++ configure Wed May 11 15:26:14 2005
+--- configure.old Sun Nov 20 15:09:16 2005
++++ configure Sun Nov 20 15:11:01 2005
@@ -838,6 +838,8 @@
--enable-qmail-newu=PATH Full path to qmail-newu program.
--enable-qmail-inject=PATH Full path to qmail-inject program.
@@ -133,3 +133,14 @@
auth_inc="-I/usr/local/include"
+@@ -8296,8 +8297,8 @@
+ fi
+ fi
+
+-echo "${CC} -O2" > cdb/conf-cc
+-echo "${CC} -s" > cdb/conf-ld
++echo "${CC} ${CFLAGS}" > cdb/conf-cc
++echo "${CC} ${STRIP}" > cdb/conf-ld
+
+ echo ""
+ echo ""