Pick up libintl instead of building a private copy.

This also fixes a file conflict with the gettext package.
This commit is contained in:
naddy 2009-06-19 17:50:47 +00:00
parent cbcea99c6e
commit 5b7bbecf67
4 changed files with 17 additions and 6 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.16 2009/03/06 21:24:52 jasper Exp $
# $OpenBSD: Makefile,v 1.17 2009/06/19 17:50:47 naddy Exp $
# Uses pthreads
COMMENT= Music tracking tool for X11
VERSION= 0.6.6
DISTNAME= soundtracker-${VERSION}
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= audio
HOMEPAGE= http://www.soundtracker.org/

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2009/06/19 17:50:47 naddy Exp $
--- aclocal.m4.orig Fri Jun 19 19:38:46 2009
+++ aclocal.m4 Fri Jun 19 19:39:19 2009
@@ -224,7 +224,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext,
AC_CACHE_CHECK([for GNU gettext in libintl],
gt_cv_func_gnugettext_libintl,
[gt_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl"
+ LIBS="$LIBS -lintl $LIBICONV"
AC_TRY_LINK([#include <libintl.h>
extern int _nl_msg_cat_cntr;],
[bindtextdomain ("", "");

View File

@ -1,3 +1,4 @@
$OpenBSD: patch-configure_in,v 1.4 2009/06/19 17:50:47 naddy Exp $
--- configure.in.orig Mon May 20 18:47:38 2002
+++ configure.in Thu Aug 21 15:54:10 2008
@@ -61,10 +61,19 @@ dnl --------------------------------------------------
@ -7,7 +8,7 @@
+case `uname` in
+ OpenBSD)
+ gtk_threads=""
+ LIBS="$LIBS -pthread -lintl"
+ LIBS="$LIBS -pthread"
+ ;;
+ *)
+ gtk_threads="gthreads"

View File

@ -1,8 +1,7 @@
@comment $OpenBSD: PLIST,v 1.6 2008/08/21 14:11:14 jasper Exp $
@comment $OpenBSD: PLIST,v 1.7 2009/06/19 17:50:47 naddy Exp $
@pkgpath audio/soundtracker,gnome
@pkgpath audio/soundtracker,gnome,esd
@bin bin/soundtracker
@comment lib/charset.alias
share/doc/soundtracker/
share/doc/soundtracker/FAQ
share/doc/soundtracker/NEWS
@ -15,7 +14,6 @@ share/locale/fr/LC_MESSAGES/soundtracker.mo
share/locale/gl/LC_MESSAGES/soundtracker.mo
share/locale/it/LC_MESSAGES/soundtracker.mo
share/locale/ja/LC_MESSAGES/soundtracker.mo
share/locale/locale.alias
share/locale/pl/LC_MESSAGES/soundtracker.mo
share/locale/ru/LC_MESSAGES/soundtracker.mo
share/locale/sl/LC_MESSAGES/soundtracker.mo