[csw-devel] SF.net SVN: gar:[18302] csw/mgar/pkg/imapfilter/trunk
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Sun Jun 10 02:04:45 CEST 2012
Revision: 18302
http://gar.svn.sourceforge.net/gar/?rev=18302&view=rev
Author: bdwalton
Date: 2012-06-10 00:04:45 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
imapfilter/trunk: bludgeon the build system to do what we need it to do
Modified Paths:
--------------
csw/mgar/pkg/imapfilter/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/imapfilter/trunk/files/0001-Bludgeon-the-build-system-to-do-what-we-need.patch
Removed Paths:
-------------
csw/mgar/pkg/imapfilter/trunk/files/make.diff
Modified: csw/mgar/pkg/imapfilter/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-09 23:45:42 UTC (rev 18301)
+++ csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-10 00:04:45 UTC (rev 18302)
@@ -16,10 +16,9 @@
MASTER_SITES = http://imapfilter.hellug.gr/source/
DISTFILES = $(NAME)-$(VERSION).tar.bz2
-# # Remove anti-social makeflags
-# PATCHFILES += make.diff
+PATCHFILES += 0001-Bludgeon-the-build-system-to-do-what-we-need.patch
-#LIBDEPS += lib/openssl
+GARCOMPILER = GNU
CONFIGURE_ARGS = -d $(prefix) -m $(mandir)
@@ -27,3 +26,5 @@
TEST_SCRIPTS =
include gar/category.mk
+
+PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH)
Added: csw/mgar/pkg/imapfilter/trunk/files/0001-Bludgeon-the-build-system-to-do-what-we-need.patch
===================================================================
--- csw/mgar/pkg/imapfilter/trunk/files/0001-Bludgeon-the-build-system-to-do-what-we-need.patch (rev 0)
+++ csw/mgar/pkg/imapfilter/trunk/files/0001-Bludgeon-the-build-system-to-do-what-we-need.patch 2012-06-10 00:04:45 UTC (rev 18302)
@@ -0,0 +1,42 @@
+From 7ad082705998d94a16c0ecd58e1a3db0e8d4936c Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sun, 10 Jun 2012 01:59:08 +0200
+Subject: [PATCH] Bludgeon the build system to do what we need
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ configure | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 6b5b0d5..bc69d56 100755
+--- a/configure
++++ b/configure
+@@ -10,13 +10,13 @@ mandir="$prefix/man"
+ ssltls="yes"
+ crammd5="yes"
+
+-incdirs="-I/usr/local/include"
+-libdirs="-L/usr/local/lib"
++incdirs="-I/opt/csw/include"
++libdirs="-L/opt/csw/lib"
+
+ mycflags="$CFLAGS -Wall -O"
+ myldflags="$LDFLAGS"
+
+-libs="-lm -llua -lpcre"
++libs="-lm -llua -lpcre -lnsl -lsocket"
+ libssl="-lssl"
+ libcrypto="-lcrypto"
+
+@@ -140,7 +140,6 @@ if [ ! -f .Makefile ]; then cp -f Makefile .Makefile; fi
+ mv -f Makefile Makefile~
+
+ cat > Makefile << EOF
+-DESTDIR =
+ BINDIR = $bindir
+ SHAREDIR = $sharedir
+ MANDIR = $mandir
+--
+1.7.10
+
Deleted: csw/mgar/pkg/imapfilter/trunk/files/make.diff
===================================================================
--- csw/mgar/pkg/imapfilter/trunk/files/make.diff 2012-06-09 23:45:42 UTC (rev 18301)
+++ csw/mgar/pkg/imapfilter/trunk/files/make.diff 2012-06-10 00:04:45 UTC (rev 18302)
@@ -1,58 +0,0 @@
-diff --speed-large-files --minimal -Nru imapfilter-1.1.1.orig/configure imapfilter-1.1.1/configure
---- imapfilter-1.1.1.orig/configure 2005-11-11 14:42:17.992451000 -0500
-+++ imapfilter-1.1.1/configure 2005-11-11 14:41:50.415788000 -0500
-@@ -13,10 +13,10 @@
- incdirs="-I/usr/local/include"
- libdirs="-L/usr/local/lib"
-
--mycflags="-Wall -O"
--myldflags=""
-+mycflags="$CFLAGS"
-+myldflags="$LDFLAGS"
-
--libs="-lm -llua -llualib"
-+libs="-lsocket -lnsl -lm -llua -llualib"
- libssl="-lssl"
- libcrypto="-lcrypto"
-
-@@ -184,24 +184,24 @@
- imapfilter.o: version.h
-
- install: \$(BIN)
-- if test ! -d \$(BINDIR); then mkdir -p \$(BINDIR); fi
-- cp -f \$(BIN) \$(BINDIR) && chmod 0755 \$(BINDIR)/\$(BIN)
-- if test ! -d \$(SHAREDIR); then mkdir -p \$(SHAREDIR); fi
-- cp -f \$(INTERFACE_LUA) \$(SHAREDIR) && \\
-- chmod 0644 \$(SHAREDIR)/\$(INTERFACE_LUA)
-- cp -f \$(AUXILIARY_LUA) \$(SHAREDIR) && \\
-- chmod 0644 \$(SHAREDIR)/\$(AUXILIARY_LUA)
-- if test ! -d \$(MANDIR)/man1; then mkdir -p \$(MANDIR)/man1; fi
-- cp -f \$(MAN_BIN) \$(MANDIR)/man1 && \\
-- chmod 0644 \$(MANDIR)/man1/\$(MAN_BIN)
-- if test ! -d \$(MANDIR)/man5; then mkdir -p \$(MANDIR)/man5; fi
-- cp -f \$(MAN_CONFIG) \$(MANDIR)/man5 && \\
-- chmod 0644 \$(MANDIR)/man5/\$(MAN_CONFIG)
-+ if test ! -d \$(DESTDIR)\$(BINDIR); then mkdir -p \$(DESTDIR)\$(BINDIR); fi
-+ cp -f \$(BIN) \$(DESTDIR)\$(BINDIR) && chmod 0755 \$(DESTDIR)\$(BINDIR)/\$(BIN)
-+ if test ! -d \$(DESTDIR)\$(SHAREDIR); then mkdir -p \$(DESTDIR)\$(SHAREDIR); fi
-+ cp -f \$(INTERFACE_LUA) \$(DESTDIR)\$(SHAREDIR) && \\
-+ chmod 0644 \$(DESTDIR)\$(SHAREDIR)/\$(INTERFACE_LUA)
-+ cp -f \$(AUXILIARY_LUA) \$(DESTDIR)\$(SHAREDIR) && \\
-+ chmod 0644 \$(DESTDIR)\$(SHAREDIR)/\$(AUXILIARY_LUA)
-+ if test ! -d \$(DESTDIR)\$(MANDIR)/man1; then mkdir -p \$(DESTDIR)\$(MANDIR)/man1; fi
-+ cp -f \$(MAN_BIN) \$(DESTDIR)\$(MANDIR)/man1 && \\
-+ chmod 0644 \$(DESTDIR)\$(MANDIR)/man1/\$(MAN_BIN)
-+ if test ! -d \$(DESTDIR)\$(MANDIR)/man5; then mkdir -p \$(DESTDIR)\$(MANDIR)/man5; fi
-+ cp -f \$(MAN_CONFIG) \$(DESTDIR)\$(MANDIR)/man5 && \\
-+ chmod 0644 \$(DESTDIR)\$(MANDIR)/man5/\$(MAN_CONFIG)
-
- deinstall:
-- rm -f \$(BINDIR)/\$(BIN) \$(SHAREDIR)/\$(INTERFACE_LUA) \\
-- \$(SHAREDIR)/\$(AUXILIARY_LUA) \$(MANDIR)/man1/\$(MAN_BIN) \\
-- \$(MANDIR)/man5/\$(MAN_CONFIG)
-+ rm -f \$(DESTDIR)\$(BINDIR)/\$(BIN) \$(DESTDIR)\$(SHAREDIR)/\$(INTERFACE_LUA) \\
-+ \$(DESTDIR)\$(SHAREDIR)/\$(AUXILIARY_LUA) \$(DESTDIR)\$(MANDIR)/man1/\$(MAN_BIN) \\
-+ \$(DESTDIR)\$(MANDIR)/man5/\$(MAN_CONFIG)
-
- uninstall: deinstall
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list