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

Update to ethos 0.2.2, upstream fixed tarball so we can remove the

Browse Source 
bundled headers in files. Tweak CONFIGURE_ENV to correctly find
libintl.h, bump ethos major as a function was renamed.
ok jasper@
This commit is contained in:
landry 2009-11-30 22:28:06 +00:00
parent f3ec398270
commit d69e4e7cbd
8 changed files with 35 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devel/ethos/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2009/10/19 12:11:12 landry Exp $
# $OpenBSD: Makefile,v 1.5 2009/11/30 22:28:06 landry Exp $
COMMENT = plugin framework library
VERSION = 0.2.0
VERSION = 0.2.2
DISTNAME = ethos-${VERSION}
PKGNAME = ${DISTNAME}p2
SHARED_LIBS= ethos-1.0 0.0 \
SHARED_LIBS= ethos-1.0 1.0 \
ethos-ui-1.0 0.0
CATEGORIES = devel
@ -24,6 +23,9 @@ CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --disable-shave \
--disable-glibtest
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_LIBTOOL = Yes
USE_GMAKE = Yes
@ -43,8 +45,4 @@ WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread-stubs xcb z
post-extract:
cp files/ethos-c-plugin-loader.h ${WRKSRC}/plugin-loaders/c/
cp files/ethos-python-plugin-loader.h ${WRKSRC}/plugin-loaders/python/
.include <bsd.port.mk>

10
devel/ethos/distinfo
View File

@ -1,5 +1,5 @@
MD5 (ethos-0.2.0.tar.gz) = CmsDDTuYB5APr+3h2x04Ng==
RMD160 (ethos-0.2.0.tar.gz) = aMVIFyxKcJvuqex2OK5UMTFhgFY=
SHA1 (ethos-0.2.0.tar.gz) = NUDxqTVziO906sS3FOCxuZtzV8c=
SHA256 (ethos-0.2.0.tar.gz) = oHrWk9KERqxmF7liSCvFzVeEs4E2ppBZ+L1Q7oe7J6w=
SIZE (ethos-0.2.0.tar.gz) = 473143
MD5 (ethos-0.2.2.tar.gz) = Ns8e9ESiJFVruk1EHEADAA==
RMD160 (ethos-0.2.2.tar.gz) = XZUmOMHjATVjUNbwiqCGQMvXtvI=
SHA1 (ethos-0.2.2.tar.gz) = 5FYcvdZeyM7/znbmNVzbcIvVJ9Y=
SHA256 (ethos-0.2.2.tar.gz) = jPuKENrnUDJaGBxrAzjF2jt9P8xm3tuX6gJDNgw+tao=
SIZE (ethos-0.2.2.tar.gz) = 521303

57
devel/ethos/files/ethos-c-plugin-loader.h
View File

@ -1,57 +0,0 @@
/* ethos-c-plugin-loader.h
*
* Copyright (C) 2009 Christian Hergert <chris@dronelabs.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
* 02110-1301 USA
*/
#ifndef __ETHOS_C_PLUGIN_LOADER_H__
#define __ETHOS_C_PLUGIN_LOADER_H__
#include <glib-object.h>
G_BEGIN_DECLS
#define ETHOS_TYPE_C_PLUGIN_LOADER (ethos_c_plugin_loader_get_type ())
#define ETHOS_C_PLUGIN_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ETHOS_TYPE_C_PLUGIN_LOADER, EthosCPluginLoader))
#define ETHOS_C_PLUGIN_LOADER_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ETHOS_TYPE_C_PLUGIN_LOADER, EthosCPluginLoader const))
#define ETHOS_C_PLUGIN_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ETHOS_TYPE_C_PLUGIN_LOADER, EthosCPluginLoaderClass))
#define ETHOS_IS_C_PLUGIN_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ETHOS_TYPE_C_PLUGIN_LOADER))
#define ETHOS_IS_C_PLUGIN_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ETHOS_TYPE_C_PLUGIN_LOADER))
#define ETHOS_C_PLUGIN_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ETHOS_TYPE_C_PLUGIN_LOADER, EthosCPluginLoaderClass))
typedef struct _EthosCPluginLoader EthosCPluginLoader;
typedef struct _EthosCPluginLoaderClass EthosCPluginLoaderClass;
typedef struct _EthosCPluginLoaderPrivate EthosCPluginLoaderPrivate;
struct _EthosCPluginLoader
{
GObject parent;
EthosCPluginLoaderPrivate *priv;
};
struct _EthosCPluginLoaderClass
{
GObjectClass parent_class;
};
GType ethos_c_plugin_loader_get_type (void) G_GNUC_CONST;
EthosPluginLoader* ethos_c_plugin_loader_new (void);
G_END_DECLS
#endif /* __ETHOS_C_PLUGIN_LOADER_H__ */

57
devel/ethos/files/ethos-python-plugin-loader.h
View File

@ -1,57 +0,0 @@
/* ethos-python-plugin-loader.h
*
* Copyright (C) 2009 Christian Hergert <chris@dronelabs.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
* 02110-1301 USA
*/
#ifndef __ETHOS_PYTHON_PLUGIN_LOADER_H__
#define __ETHOS_PYTHON_PLUGIN_LOADER_H__
#include <glib-object.h>
G_BEGIN_DECLS
#define ETHOS_TYPE_PYTHON_PLUGIN_LOADER (ethos_python_plugin_loader_get_type ())
#define ETHOS_PYTHON_PLUGIN_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ETHOS_TYPE_PYTHON_PLUGIN_LOADER, EthosPythonPluginLoader))
#define ETHOS_PYTHON_PLUGIN_LOADER_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ETHOS_TYPE_PYTHON_PLUGIN_LOADER, EthosPythonPluginLoader const))
#define ETHOS_PYTHON_PLUGIN_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ETHOS_TYPE_PYTHON_PLUGIN_LOADER, EthosPythonPluginLoaderClass))
#define ETHOS_IS_PYTHON_PLUGIN_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ETHOS_TYPE_PYTHON_PLUGIN_LOADER))
#define ETHOS_IS_PYTHON_PLUGIN_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ETHOS_TYPE_PYTHON_PLUGIN_LOADER))
#define ETHOS_PYTHON_PLUGIN_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ETHOS_TYPE_PYTHON_PLUGIN_LOADER, EthosPythonPluginLoaderClass))
typedef struct _EthosPythonPluginLoader EthosPythonPluginLoader;
typedef struct _EthosPythonPluginLoaderClass EthosPythonPluginLoaderClass;
typedef struct _EthosPythonPluginLoaderPrivate EthosPythonPluginLoaderPrivate;
struct _EthosPythonPluginLoader
{
GObject parent;
EthosPythonPluginLoaderPrivate *priv;
};
struct _EthosPythonPluginLoaderClass
{
GObjectClass parent_class;
};
GType ethos_python_plugin_loader_get_type (void) G_GNUC_CONST;
EthosPluginLoader* ethos_python_plugin_loader_new (void);
G_END_DECLS
#endif /* __ETHOS_PYTHON_PLUGIN_LOADER_H__ */

120
devel/ethos/patches/patch-configure
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-configure,v 1.3 2009/10/12 18:21:14 landry Exp $
--- configure.orig Wed Jun 17 21:39:05 2009
+++ configure Mon Oct 12 20:18:52 2009
@@ -12908,81 +12908,6 @@ fi
$OpenBSD: patch-configure,v 1.4 2009/11/30 22:28:06 landry Exp $
--- configure.orig Thu Nov 19 23:20:25 2009
+++ configure Sun Nov 29 21:35:32 2009
@@ -13036,81 +13036,6 @@ fi
enable_vala=no
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for VALA" >&5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALA" >&5
-$as_echo_n "checking for VALA... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
@ -14,11 +14,11 @@ $OpenBSD: patch-configure,v 1.3 2009/10/12 18:21:14 landry Exp $
- pkg_cv_VALA_CFLAGS="$VALA_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0\"") >&5
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "vala-1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-1.0" 2>/dev/null`
-else
- pkg_failed=yes
@ -32,11 +32,11 @@ $OpenBSD: patch-configure,v 1.3 2009/10/12 18:21:14 landry Exp $
- pkg_cv_VALA_LIBS="$VALA_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0\"") >&5
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "vala-1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-1.0" 2>/dev/null`
-else
- pkg_failed=yes
@ -63,7 +63,7 @@ $OpenBSD: patch-configure,v 1.3 2009/10/12 18:21:14 landry Exp $
- # Put the nasty error message in config.log where it belongs
- echo "$VALA_PKG_ERRORS" >&5
-
- { $as_echo "$as_me:$LINENO: result: no" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- enable_vala=no
-elif test $pkg_failed = untried; then
@ -71,7 +71,7 @@ $OpenBSD: patch-configure,v 1.3 2009/10/12 18:21:14 landry Exp $
-else
- VALA_CFLAGS=$pkg_cv_VALA_CFLAGS
- VALA_LIBS=$pkg_cv_VALA_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- enable_vala=yes
-fi
@ -83,97 +83,3 @@ $OpenBSD: patch-configure,v 1.3 2009/10/12 18:21:14 landry Exp $
if test "x$enable_vala" = "xyes"; then
ENABLE_VALA_TRUE=
ENABLE_VALA_FALSE='#'
@@ -13665,76 +13590,7 @@ fi
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for MONO" >&5
-$as_echo_n "checking for MONO... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$MONO_CFLAGS"; then
- pkg_cv_MONO_CFLAGS="$MONO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono >= 2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "mono >= 2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_MONO_CFLAGS=`$PKG_CONFIG --cflags "mono >= 2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$MONO_LIBS"; then
- pkg_cv_MONO_LIBS="$MONO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono >= 2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "mono >= 2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_MONO_LIBS=`$PKG_CONFIG --libs "mono >= 2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- MONO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mono >= 2.0"`
- else
- MONO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mono >= 2.0"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$MONO_PKG_ERRORS" >&5
-
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- enable_mono=no
-elif test $pkg_failed = untried; then
enable_mono=no
-else
- MONO_CFLAGS=$pkg_cv_MONO_CFLAGS
- MONO_LIBS=$pkg_cv_MONO_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
- enable_mono=yes
-fi
if test "x$enable_mono" = "xyes"; then
ENABLE_MONO_TRUE=
ENABLE_MONO_FALSE='#'
@@ -13974,7 +13830,7 @@ fi
-ac_config_files="$ac_config_files build/autotools/shave-libtool build/autotools/shave Makefile ethos/Makefile ethos/ethos-version.h plugin-loaders/Makefile plugin-loaders/c/Makefile plugin-loaders/python/Makefile plugin-loaders/js/Makefile plugin-loaders/mono/Makefile bindings/Makefile bindings/vala/Makefile bindings/python/Makefile bindings/mono/Makefile examples/Makefile examples/simple-ui/Makefile examples/vala/Makefile tests/Makefile tests/c-plugins/Makefile tests/manager-dep/Makefile data/Makefile data/pixmaps/Makefile doc/Makefile doc/reference/Makefile doc/reference/version.xml ethos.pc ethos-ui.pc"
+ac_config_files="$ac_config_files build/autotools/shave-libtool build/autotools/shave Makefile ethos/Makefile ethos/ethos-version.h plugin-loaders/Makefile plugin-loaders/c/Makefile plugin-loaders/python/Makefile plugin-loaders/js/Makefile plugin-loaders/mono/Makefile bindings/Makefile bindings/vala/Makefile bindings/python/Makefile examples/Makefile examples/simple-ui/Makefile examples/vala/Makefile tests/Makefile tests/c-plugins/Makefile tests/manager-dep/Makefile data/Makefile data/pixmaps/Makefile doc/Makefile doc/reference/Makefile doc/reference/version.xml ethos.pc ethos-ui.pc"
cat >confcache <<\_ACEOF
@@ -14937,7 +14793,6 @@ do
"bindings/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/Makefile" ;;
"bindings/vala/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/vala/Makefile" ;;
"bindings/python/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/python/Makefile" ;;
- "bindings/mono/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/mono/Makefile" ;;
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
"examples/simple-ui/Makefile") CONFIG_FILES="$CONFIG_FILES examples/simple-ui/Makefile" ;;
"examples/vala/Makefile") CONFIG_FILES="$CONFIG_FILES examples/vala/Makefile" ;;

8
devel/ethos/patches/patch-plugin-loaders_c_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-plugin-loaders_c_Makefile_in,v 1.1 2009/10/11 13:37:47 landry Exp $
--- plugin-loaders/c/Makefile.in.orig Wed Jun 17 21:39:09 2009
+++ plugin-loaders/c/Makefile.in Sun Oct 11 15:21:51 2009
@@ -70,7 +70,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
$OpenBSD: patch-plugin-loaders_c_Makefile_in,v 1.2 2009/11/30 22:28:06 landry Exp $
--- plugin-loaders/c/Makefile.in.orig Thu Nov 19 23:20:24 2009
+++ plugin-loaders/c/Makefile.in Sun Nov 29 21:34:04 2009
@@ -88,7 +88,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

8
devel/ethos/patches/patch-plugin-loaders_python_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-plugin-loaders_python_Makefile_in,v 1.1 2009/10/11 13:37:47 landry Exp $
--- plugin-loaders/python/Makefile.in.orig Wed Jun 17 21:39:09 2009
+++ plugin-loaders/python/Makefile.in Sun Oct 11 15:22:11 2009
@@ -78,7 +78,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
$OpenBSD: patch-plugin-loaders_python_Makefile_in,v 1.2 2009/11/30 22:28:06 landry Exp $
--- plugin-loaders/python/Makefile.in.orig Thu Nov 19 23:20:24 2009
+++ plugin-loaders/python/Makefile.in Sun Nov 29 21:34:04 2009
@@ -96,7 +96,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

8
devel/ethos/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2009/10/11 13:37:48 landry Exp $
@comment $OpenBSD: PLIST,v 1.3 2009/11/30 22:28:06 landry Exp $
%%SHARED%%
include/ethos-1.0/
include/ethos-1.0/ethos/
@ -26,7 +26,6 @@ lib/libethos-ui-1.0.a
lib/libethos-ui-1.0.la
lib/pkgconfig/ethos-1.0.pc
lib/pkgconfig/ethos-ui-1.0.pc
lib/python${MODPY_VERSION}/site-packages/gtk-2.0/
lib/python${MODPY_VERSION}/site-packages/gtk-2.0/_ethos.a
lib/python${MODPY_VERSION}/site-packages/gtk-2.0/_ethos.la
lib/python${MODPY_VERSION}/site-packages/gtk-2.0/_ethosui.a
@ -67,8 +66,7 @@ share/gtk-doc/html/ethos/left.png
share/gtk-doc/html/ethos/right.png
share/gtk-doc/html/ethos/style.css
share/gtk-doc/html/ethos/up.png
share/pygtk/
share/pygtk/2.0/
share/pygtk/2.0/defs/
share/locale/de/LC_MESSAGES/ethos.mo
share/locale/fr/LC_MESSAGES/ethos.mo
share/pygtk/2.0/defs/ethos.defs
share/pygtk/2.0/defs/ethosui.defs