cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

properly handle libiconv/libintl variables in patch-configure

Browse Source 
discussed with and ok ajacoutot@
This commit is contained in:
landry 2007-10-17 21:40:35 +00:00
parent 9b80a0491f
commit 410bea9fb3
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/claws-mail-rssyl/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2007/10/09 21:44:48 landry Exp $
# $OpenBSD: Makefile,v 1.2 2007/10/17 21:40:35 landry Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= RSS aggregator plugin for Claws-mail
VERSION= 0.15
DISTNAME= rssyl-${VERSION}
PKGNAME= claws-mail-rssyl-${VERSION}
PKGNAME= claws-mail-rssyl-${VERSION}p0
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
CATEGORIES= mail
@ -37,7 +37,7 @@ WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-static
.include <bsd.port.mk>

35
mail/claws-mail-rssyl/patches/patch-configure
View File

@ -1,18 +1,17 @@
$OpenBSD: patch-configure,v 1.1.1.1 2007/10/09 21:44:48 landry Exp $
--- configure.orig Tue Oct 9 19:31:28 2007
+++ configure Tue Oct 9 19:32:00 2007
@@ -22190,12 +22190,12 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <libintl.h>
$gt_revision_test_code
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
+extern int libintl_nl_domain_bindings;
int
main ()
{
bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + libintl_nl_domain_bindings
;
return 0;
}
$OpenBSD: patch-configure,v 1.2 2007/10/17 21:40:35 landry Exp $
--- configure.orig Wed Oct 17 21:54:58 2007
+++ configure Wed Oct 17 22:12:22 2007
@@ -24947,10 +24947,10 @@ XGETTEXT!$XGETTEXT$ac_delim
XGETTEXT_015!$XGETTEXT_015$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
-LIBICONV!$LIBICONV$ac_delim
+LIBICONV!$LTLIBICONV$ac_delim
LTLIBICONV!$LTLIBICONV$ac_delim
-INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
+INTLLIBS!$LTLIBINTL$ac_delim
+LIBINTL!$LTLIBINTL$ac_delim
LTLIBINTL!$LTLIBINTL$ac_delim
POSUB!$POSUB$ac_delim
CLAWS_MAIL_CFLAGS!$CLAWS_MAIL_CFLAGS$ac_delim