Drop uneeded patches.
This commit is contained in:
parent
61bc7b682d
commit
5d72afc384
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.4 2013/05/31 15:34:39 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.5 2013/06/01 19:01:12 ajacoutot Exp $
|
||||
|
||||
COMMENT = GTK2-based MPD client inspired by Rhythmbox
|
||||
DISTNAME = ario-1.5.1
|
||||
@ -49,8 +49,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
|
||||
net/curl \
|
||||
x11/gtk+2,-guic
|
||||
|
||||
AUTOCONF_VERSION= 2.67
|
||||
CONFIGURE_STYLE = autoconf
|
||||
CONFIGURE_STYLE = gnu
|
||||
USE_GMAKE = Yes
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,25 +0,0 @@
|
||||
$OpenBSD: patch-aclocal_m4,v 1.1 2013/05/09 14:46:59 ajacoutot Exp $
|
||||
|
||||
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
|
||||
|
||||
--- aclocal.m4.orig Mon Jun 13 18:11:52 2011
|
||||
+++ aclocal.m4 Thu May 9 16:37:14 2013
|
||||
@@ -565,6 +565,8 @@ fi
|
||||
# Substitute ALL_LINGUAS so we can use it in po/Makefile
|
||||
AC_SUBST(ALL_LINGUAS)
|
||||
|
||||
+AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
|
||||
+
|
||||
# Set DATADIRNAME correctly if it is not set yet
|
||||
# (copied from glib-gettext.m4)
|
||||
if test -z "$DATADIRNAME"; then
|
||||
@@ -582,6 +584,9 @@ if test -z "$DATADIRNAME"; then
|
||||
dnl in this case.
|
||||
AC_CHECK_FUNC(bind_textdomain_codeset,
|
||||
[DATADIRNAME=share], [DATADIRNAME=lib])
|
||||
+ ;;
|
||||
+ *-*-openbsd*)
|
||||
+ [DATADIRNAME=share]
|
||||
;;
|
||||
*)
|
||||
[DATADIRNAME=lib]
|
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-po_Makefile_in_in,v 1.1 2011/11/15 15:47:52 mpi Exp $
|
||||
--- po/Makefile.in.in Sat Nov 12 18:35:15 2011
|
||||
+++ po/Makefile.in.in Sat Nov 12 18:36:14 2011
|
||||
@@ -33,8 +33,7 @@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
libdir = @libdir@
|
||||
-DATADIRNAME = @DATADIRNAME@
|
||||
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
|
||||
+itlocaledir = @localedir@
|
||||
subdir = po
|
||||
install_sh = @install_sh@
|
||||
# Automake >= 1.8 provides @mkdir_p@.
|
@ -1,25 +0,0 @@
|
||||
$OpenBSD: patch-m4_intltool_m4,v 1.1 2012/09/10 09:13:10 ajacoutot Exp $
|
||||
|
||||
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
|
||||
|
||||
--- m4/intltool.m4.orig Sun Aug 12 23:31:52 2012
|
||||
+++ m4/intltool.m4 Mon Sep 10 10:50:39 2012
|
||||
@@ -155,6 +155,8 @@ fi
|
||||
# Substitute ALL_LINGUAS so we can use it in po/Makefile
|
||||
AC_SUBST(ALL_LINGUAS)
|
||||
|
||||
+AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
|
||||
+
|
||||
# Set DATADIRNAME correctly if it is not set yet
|
||||
# (copied from glib-gettext.m4)
|
||||
if test -z "$DATADIRNAME"; then
|
||||
@@ -172,6 +174,9 @@ if test -z "$DATADIRNAME"; then
|
||||
dnl in this case.
|
||||
AC_CHECK_FUNC(bind_textdomain_codeset,
|
||||
[DATADIRNAME=share], [DATADIRNAME=lib])
|
||||
+ ;;
|
||||
+ *-*-openbsd*)
|
||||
+ [DATADIRNAME=share]
|
||||
;;
|
||||
*)
|
||||
[DATADIRNAME=lib]
|
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.5 2012/11/01 08:08:31 jasper Exp $
|
||||
|
||||
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
|
||||
|
||||
--- configure.orig Thu Nov 1 05:22:58 2012
|
||||
+++ configure Thu Nov 1 08:59:44 2012
|
||||
@@ -13731,6 +13731,9 @@ else
|
||||
fi
|
||||
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ DATADIRNAME=share
|
||||
+ ;;
|
||||
*)
|
||||
DATADIRNAME=lib
|
||||
;;
|
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.13 2012/11/26 16:24:29 jasper Exp $
|
||||
|
||||
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
|
||||
|
||||
--- configure.orig Mon Nov 26 14:40:08 2012
|
||||
+++ configure Mon Nov 26 17:18:43 2012
|
||||
@@ -12734,6 +12734,9 @@ else
|
||||
fi
|
||||
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ DATADIRNAME=share
|
||||
+ ;;
|
||||
*)
|
||||
DATADIRNAME=lib
|
||||
;;
|
Loading…
Reference in New Issue
Block a user