Drop uneeded patches.

This commit is contained in:
ajacoutot 2013-06-01 19:19:16 +00:00
parent 065567d39c
commit 6126547b01
21 changed files with 7 additions and 327 deletions

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure,v 1.5 2013/03/30 08:26:18 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Tue Feb 26 01:05:27 2013
+++ configure Sat Mar 30 09:15:41 2013
@@ -16011,6 +16011,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure,v 1.5 2013/03/28 19:33:06 jasper Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Tue Mar 26 08:36:46 2013
+++ configure Thu Mar 28 13:06:48 2013
@@ -12239,6 +12239,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2013/03/29 10:08:49 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Mar 25 13:40:46 2013
+++ configure Fri Mar 29 10:54:56 2013
@@ -12926,6 +12926,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

View File

@ -1,7 +1,4 @@
$OpenBSD: patch-gtk_configure,v 1.3 2012/09/10 08:08:49 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
$OpenBSD: patch-gtk_configure,v 1.4 2013/06/01 19:19:16 ajacoutot Exp $
--- gtk/configure.orig Sun Jan 10 18:28:11 2010
+++ gtk/configure Sun Oct 2 09:23:54 2011
@@ -2351,7 +2351,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
@ -13,13 +10,3 @@ Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
CXXFLAGS="$CFLAGS"
ac_ext=c
@@ -5003,6 +5003,9 @@ else
DATADIRNAME=lib
fi
+ ;;
+ *-*-openbsd*)
+ DATADIRNAME=share
;;
*)
DATADIRNAME=lib

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure,v 1.3 2013/03/05 07:57:31 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Dec 17 16:54:44 2012
+++ configure Fri Mar 1 09:47:32 2013
@@ -13433,6 +13433,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

View File

@ -1,21 +1,9 @@
$OpenBSD: patch-configure,v 1.12 2013/06/01 18:35:24 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
$OpenBSD: patch-configure,v 1.13 2013/06/01 19:19:16 ajacoutot Exp $
/var/lib -> /var/db
--- configure.orig Mon May 13 10:39:34 2013
+++ configure Sat Jun 1 20:00:39 2013
@@ -13923,6 +13923,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;
@@ -18099,7 +18102,7 @@ _ACEOF
fi

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure,v 1.7 2012/09/10 08:08:49 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Sun Sep 25 22:50:23 2011
+++ configure Sun Nov 13 17:52:03 2011
@@ -11722,6 +11722,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2012/09/10 08:40:14 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- aclocal.m4.orig Tue May 22 01:03:42 2012
+++ aclocal.m4 Mon Sep 10 10:35:29 2012
@@ -294,6 +294,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
@@ -311,6 +313,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]

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2012/09/10 08:08:49 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Sun Oct 2 10:04:58 2011
+++ configure Sun Oct 2 10:05:28 2011
@@ -16749,6 +16749,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure,v 1.3 2012/10/28 17:48:24 fgsch Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Thu Mar 29 02:56:50 2012
+++ configure Thu Oct 25 01:09:59 2012
@@ -6416,6 +6416,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2013/03/21 08:46:31 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.5 2013/06/01 19:19:16 ajacoutot Exp $
COMMENT = library to deal with Japanese kana-to-kanji conversion
@ -30,6 +30,5 @@ LIB_DEPENDS = devel/libgee06 \
USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = DATADIRNAME=share
.include <bsd.port.mk>

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.2 2012/09/10 08:08:49 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- aclocal.m4.orig Sun Oct 2 09:53:33 2011
+++ aclocal.m4 Sun Oct 2 09:54:36 2011
@@ -141,6 +141,9 @@ if test -z "$DATADIRNAME"; then
AC_CHECK_FUNC(bind_textdomain_codeset,
[DATADIRNAME=share], [DATADIRNAME=lib])
;;
+ *-*-openbsd*)
+ [DATADIRNAME=share]
+ ;;
*)
[DATADIRNAME=lib]
;;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-m4_intltool_m4,v 1.1 2012/09/10 17:31:21 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- m4/intltool.m4.orig Mon Aug 13 02:34:02 2012
+++ m4/intltool.m4 Mon Sep 10 18:40:36 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]

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2013/03/28 07:49:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2013/06/01 19:19:16 ajacoutot Exp $
PKG_ARCH = *
COMMENT = MIME types and icons for chemical applications
@ -22,10 +22,9 @@ RUN_DEPENDS = misc/shared-mime-info \
x11/gnome/mime-data \
x11/gtk+2,-guic
AUTOCONF_VERSION= 2.61
SEPARATE_BUILD = Yes
USE_GMAKE = Yes
CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --disable-update-database
.include <bsd.port.mk>

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2013/03/28 07:49:32 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- aclocal.m4.orig Mon Feb 5 02:09:03 2007
+++ aclocal.m4 Thu Mar 28 08:41:57 2013
@@ -104,6 +104,8 @@ AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
# 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
@@ -119,6 +121,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]

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2013/05/31 15:34:52 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.6 2013/06/01 19:19:16 ajacoutot Exp $
SHARED_ONLY = Yes
@ -27,8 +27,7 @@ WANTLIB += wavpack xcb xcb-render xcb-shm z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=imagination/}
AUTOCONF_VERSION = 2.67
CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --localedir=${PREFIX}/share/locale
MODULES = devel/gettext \
textproc/intltool

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2013/04/17 13:20:20 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- aclocal.m4.orig Sun Jan 9 16:00:28 2011
+++ aclocal.m4 Wed Apr 17 15:07:39 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]

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure,v 1.4 2013/03/30 09:25:32 jasper Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Feb 18 04:30:22 2013
+++ configure Sat Mar 30 09:06:46 2013
@@ -15211,6 +15211,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2013/03/30 19:11:06 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Mar 18 20:19:27 2013
+++ configure Sat Mar 30 20:01:01 2013
@@ -14745,6 +14745,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure,v 1.13 2013/03/29 12:41:26 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Mar 18 17:21:15 2013
+++ configure Wed Mar 27 08:29:56 2013
@@ -14205,6 +14205,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure,v 1.6 2013/03/29 15:59:04 jasper Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Mar 25 16:52:28 2013
+++ configure Fri Mar 29 16:48:15 2013
@@ -12996,6 +12996,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;