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

- link correctly with libiconv and libintl, without adding them to LDFLAGS

Browse Source
This commit is contained in:
ajacoutot 2007-10-16 14:46:01 +00:00
parent ca351c243d
commit addc338b24
4 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/obconf/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.10 2007/09/25 18:29:38 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.11 2007/10/16 14:46:01 ajacoutot Exp $
COMMENT= configuration utility for openbox
DISTNAME= obconf-2.0.2
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= x11
HOMEPAGE= http://icculus.org/openbox/index.php/Obconf
@ -37,6 +37,6 @@ USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>

34
x11/obconf/patches/patch-configure
View File

@ -1,17 +1,17 @@
$OpenBSD: patch-configure,v 1.1 2007/07/29 13:04:19 ajacoutot Exp $
--- configure.orig Sun Jul 29 14:42:48 2007
+++ configure Sun Jul 29 14:43:00 2007
@@ -4830,12 +4830,11 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
int
main ()
{
bindtextdomain ("", "");
-return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("") + _nl_msg_cat_cntr
;
return 0;
}
$OpenBSD: patch-configure,v 1.2 2007/10/16 14:46:01 ajacoutot Exp $
--- configure.orig Tue Oct 16 16:14:14 2007
+++ configure Tue Oct 16 16:14:48 2007
@@ -7224,10 +7224,10 @@ host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$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
_ACEOF

5
x11/openbox/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.35 2007/08/27 11:49:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.36 2007/10/16 14:46:01 ajacoutot Exp $
COMMENT= small, fast & usable window manager
DISTNAME= openbox-3.4.4
PKGNAME= ${DISTNAME}p0
SHARED_LIBS+= obparser 6.0 # .16.1
SHARED_LIBS+= obrender 6.0 # .16.1
CATEGORIES= x11
@ -34,7 +35,7 @@ USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
pre-configure:

34
x11/openbox/patches/patch-configure
View File

@ -1,17 +1,17 @@
$OpenBSD: patch-configure,v 1.1 2007/07/29 13:02:32 ajacoutot Exp $
--- configure.orig Sun Jul 29 14:15:01 2007
+++ configure Sun Jul 29 14:15:17 2007
@@ -20744,12 +20744,11 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
int
main ()
{
bindtextdomain ("", "");
-return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("") + _nl_msg_cat_cntr
;
return 0;
}
$OpenBSD: patch-configure,v 1.2 2007/10/16 14:46:01 ajacoutot Exp $
--- configure.orig Sat Aug 4 23:41:43 2007
+++ configure Tue Oct 16 16:07:20 2007
@@ -26000,10 +26000,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
SED!$SED$ac_delim