From 663231a0362ed33ae5737f2e227960219beddb1c Mon Sep 17 00:00:00 2001
From: Sergey Matveychuk <sem@FreeBSD.org>
Date: Wed, 13 Apr 2005 18:39:36 +0000
Subject: - Fix build modules
PR: ports/78318
Reported by: Clemens Fischer <ino-qc@spotteswoode.de.eu.org>
---
mail/qsf/Makefile | 9 ++++++---
mail/qsf/files/patch-link.mk | 14 ++++++++++++++
mail/qsf/files/patch-vars.mk | 11 +++++++++++
3 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 mail/qsf/files/patch-link.mk
create mode 100644 mail/qsf/files/patch-vars.mk
(limited to 'mail/qsf')
diff --git a/mail/qsf/Makefile b/mail/qsf/Makefile
index ae4f9d097f6b..a0a3a9117e5d 100644
--- a/mail/qsf/Makefile
+++ b/mail/qsf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qsf
PORTVERSION= 1.0.18
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= qsf
@@ -18,6 +19,8 @@ GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_REINPLACE= yes
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+
MAN1= qsf.1
MANCOMPRESSED= yes
PLIST_FILES= bin/qsf
@@ -30,17 +33,17 @@ OPTIONS= GDBM "GDBM support" off \
.if defined(WITH_GDBM)
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+= --with-gdbm=${LOCALBASE}
+CONFIGURE_ARGS+= --with-gdbm
.endif
.if defined(WITH_MYSQL)
USE_MYSQL= yes
-CONFIGURE_ARGS+= --with-mysql=${LOCALBASE}
+CONFIGURE_ARGS+= --with-mysql
.endif
.if defined(WITH_SQLITE2)
LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2
-CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE}
+CONFIGURE_ARGS+= --with-sqlite
.endif
# not supported yet.
diff --git a/mail/qsf/files/patch-link.mk b/mail/qsf/files/patch-link.mk
new file mode 100644
index 000000000000..10a46f1796d4
--- /dev/null
+++ b/mail/qsf/files/patch-link.mk
@@ -0,0 +1,14 @@
+--- autoconf/make/link.mk.orig Wed Apr 13 21:33:54 2005
++++ autoconf/make/link.mk Wed Apr 13 21:34:15 2005
+@@ -6,9 +6,9 @@
+ mainobjs := src/main.o src/md5.o src/library.o src/db.o src/message.o src/mailbox.o src/spam.o src/tests.o
+
+ $(package): $(mainobjs)
+- $(CC) $(CFLAGS) -o $@ $(mainobjs) $(LIBS)
++ $(CC) $(CFLAGS) -o $@ $(mainobjs) ${LDFLAGS} $(LIBS)
+
+ $(package)-static: $(mainobjs)
+- $(CC) $(CFLAGS) -static -o $@ $(mainobjs) $(LIBS)
++ $(CC) $(CFLAGS) -static -o $@ $(mainobjs) ${LDFLAGS} $(LIBS)
+
+ # EOF
diff --git a/mail/qsf/files/patch-vars.mk b/mail/qsf/files/patch-vars.mk
new file mode 100644
index 000000000000..11f532a628a4
--- /dev/null
+++ b/mail/qsf/files/patch-vars.mk
@@ -0,0 +1,11 @@
+--- autoconf/make/vars.mk.orig Wed Apr 13 21:33:12 2005
++++ autoconf/make/vars.mk Wed Apr 13 21:35:10 2005
+@@ -24,7 +24,7 @@
+ INSTALL_DATA = @INSTALL_DATA@
+ UNINSTALL = rm -f
+
+-LDFLAGS = -r
++LDFLAGS = -r @LDFLAGS@
+ DEFS = @DEFS@
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/src/include -Isrc/include $(DEFS)
--
cgit v1.2.3