summaryrefslogtreecommitdiff
path: root/mail/fetchmail
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2007-01-17 19:18:01 +0000
committertron <tron@pkgsrc.org>2007-01-17 19:18:01 +0000
commit78b9e98d87ce9bac5a715ef5d33e9cd2b01da126 (patch)
treef6da471c836da6174a0eaf89a933684eaff2cd92 /mail/fetchmail
parent7d9ad417c4d452d0a607217d3a4c955438394994 (diff)
downloadpkgsrc-78b9e98d87ce9bac5a715ef5d33e9cd2b01da126.tar.gz
Use documented trick to disable Python detection instead of patching
"Makefile.in". Hint provided by Matthias Andree in private e-mail.
Diffstat (limited to 'mail/fetchmail')
-rw-r--r--mail/fetchmail/Makefile3
-rw-r--r--mail/fetchmail/distinfo3
-rw-r--r--mail/fetchmail/patches/patch-ab41
3 files changed, 3 insertions, 44 deletions
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index ac26d0291fc..2edf94ee948 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.160 2007/01/17 17:36:51 salo Exp $
+# $NetBSD: Makefile,v 1.161 2007/01/17 19:18:01 tron Exp $
DISTNAME= fetchmail-6.3.6
CATEGORIES= mail
@@ -17,6 +17,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-hesiod
+CONFIGURE_ENV+= PYTHON=:
LDFLAGS+= ${CFLAGS}
USE_TOOLS+= msgfmt tbl
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index a1513fe008b..311baf52575 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.35 2007/01/17 14:29:11 tron Exp $
+$NetBSD: distinfo,v 1.36 2007/01/17 19:18:01 tron Exp $
SHA1 (fetchmail-6.3.6.tar.bz2) = 4c362d8d86c0d4efb191d0faae0b48b54b0887ba
RMD160 (fetchmail-6.3.6.tar.bz2) = 455c1413cc5090f834e82be4876b572d4bef35cc
Size (fetchmail-6.3.6.tar.bz2) = 1307730 bytes
-SHA1 (patch-ab) = dd157d0d51ed0abfbdcd6ef51d4bc87d2b3ee8fb
diff --git a/mail/fetchmail/patches/patch-ab b/mail/fetchmail/patches/patch-ab
deleted file mode 100644
index 7e6710c508f..00000000000
--- a/mail/fetchmail/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.16 2007/01/17 14:29:11 tron Exp $
-
---- Makefile.in.orig 2007-01-05 21:27:59.000000000 +0000
-+++ Makefile.in 2007-01-17 13:42:08.000000000 +0000
-@@ -42,7 +42,6 @@
- host_triplet = @host@
- target_triplet = @target@
- bin_PROGRAMS = fetchmail$(EXEEXT)
--@HAVE_PYTHON_TRUE@am__append_1 = $(pym)
- check_PROGRAMS = $(am__EXEEXT_1) rfc822$(EXEEXT) unmime$(EXEEXT) \
- netrc$(EXEEXT) rfc2047e$(EXEEXT) mxget$(EXEEXT)
- @NEED_TRIO_TRUE@am__append_2 = libtrio.a
-@@ -355,7 +354,7 @@
- libexecdir = @libexecdir@
-
- # for gettext (used by fetchmail.c, NOT by GNU gettext)
--localedir = $(datadir)/locale
-+localedir = /usr/pkg/share/locale
- localstatedir = @localstatedir@
- maildrop = @maildrop@
- mandir = @mandir@
-@@ -391,9 +390,8 @@
- dist_man1_MANS = fetchmail.man $(am__append_1)
- pys = fetchmailconf.py
- pym = fetchmailconf.man
--@HAVE_PYTHON_TRUE@nodist_bin_SCRIPTS = fetchmailconf
- @HAVE_PYTHON_TRUE@python_PYTHON = $(pys)
--@HAVE_PYTHON_FALSE@EXTRA_DIST = $(pym) $(DISTDOCS) fetchmail.spec \
-+@HAVE_PYTHON_FALSE@EXTRA_DIST = $(DISTDOCS) fetchmail.spec \
- @HAVE_PYTHON_FALSE@ $(distdirs) ucs/README.svn trio/CHANGES \
- @HAVE_PYTHON_FALSE@ trio/README strlcpy.3 bighand.png \
- @HAVE_PYTHON_FALSE@ m4-local/ac-archive-license.txt \
-@@ -1413,7 +1411,7 @@
-
- info-am:
-
--install-data-am: install-man install-pythonPYTHON
-+install-data-am: install-man
-
- install-exec-am: install-binPROGRAMS install-nodist_binSCRIPTS
-