- Fix libintl detection

- Don't use bundled libintl headers
- Bump PKGNAME
This commit is contained in:
alek 2005-02-19 21:27:35 +00:00
parent 4999dfa6f1
commit 79c2dcee03
3 changed files with 32 additions and 9 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.100 2005/01/02 12:56:05 alek Exp $
# $OpenBSD: Makefile,v 1.101 2005/02/19 21:27:35 alek Exp $
COMMENT= "mail retrieval utility for POP2, POP3, KPOP, IMAP and more"
DISTNAME= fetchmail-6.2.5
PKGNAME= ${DISTNAME}p0
CATEGORIES= mail
MASTER_SITES= http://catb.org/~esr/fetchmail/ \
ftp://ftp.ccil.org/pub/esr/fetchmail/

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2002/09/10 10:14:24 fgsch Exp $
--- Makefile.in.orig Tue Sep 10 06:29:19 2002
+++ Makefile.in Tue Sep 10 06:29:54 2002
@@ -133,16 +133,16 @@ dummy:
$OpenBSD: patch-Makefile_in,v 1.5 2005/02/19 21:27:35 alek Exp $
--- Makefile.in.orig Thu Oct 16 00:38:18 2003
+++ Makefile.in Sat Feb 19 22:10:08 2005
@@ -133,19 +133,19 @@ dummy:
# Tester for address parsing
rfc822: rfc822.c
@ -20,4 +20,8 @@ $OpenBSD: patch-Makefile_in,v 1.4 2002/09/10 10:14:24 fgsch Exp $
+ $(CC) -DSTANDALONE -DHAVE_CONFIG_H -I. -g -o $@ $?
.c.o:
$(CC) $(defines) -c $(CPFLAGS) -I. -I$(srcdir) -I$(top_builddir)/intl -I$(top_srcdir)/intl $(CEFLAGS) $(CFLAGS) $<
- $(CC) $(defines) -c $(CPFLAGS) -I. -I$(srcdir) -I$(top_builddir)/intl -I$(top_srcdir)/intl $(CEFLAGS) $(CFLAGS) $<
+ $(CC) $(defines) -c $(CPFLAGS) -I. -I$(srcdir) $(CEFLAGS) $(CFLAGS) $<
# For some losing Unix makes.
SHELL = /bin/sh

View File

@ -1,6 +1,24 @@
$OpenBSD: patch-configure,v 1.6 2003/08/13 23:28:24 fgsch Exp $
--- configure.orig 2003-07-17 16:14:21.000000000 -0300
+++ configure 2003-08-13 20:01:47.000000000 -0300
$OpenBSD: patch-configure,v 1.7 2005/02/19 21:27:35 alek Exp $
--- configure.orig Fri Oct 10 10:39:54 2003
+++ configure Sat Feb 19 14:04:10 2005
@@ -8735,7 +8735,7 @@ if test "${ac_cv_lib_intl_gettext+set}"
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -8784,7 +8784,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_intl_gettext" >&5
echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6
if test $ac_cv_lib_intl_gettext = yes; then
- LIBS="$LIBS -lintl"
+ LIBS="$LIBS -lintl -liconv"
fi
@@ -12795,7 +12795,7 @@ _ACEOF
_ACEOF