diff options
| -rw-r--r-- | devel/ORBit2/Makefile | 7 | ||||
| -rw-r--r-- | devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c | 11 | ||||
| -rw-r--r-- | devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c | 11 |
3 files changed, 28 insertions, 1 deletions
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 5521f9321..ab3ce0114 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -7,6 +7,7 @@ PORTNAME= ORBit2 PORTVERSION= 2.7.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.7 @@ -28,8 +29,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" post-patch: - @find ${WRKSRC} -type f | xargs ${GREP} -l LINC_THREADSAFE | \ + @${FIND} ${WRKSRC} -type f | ${XARGS} ${GREP} -l LINC_THREADSAFE | \ ${XARGS} ${REINPLACE_CMD} -e 's|LINC_THREADSAFE|G_THREADS_ENABLED|g' + @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/src/idl-compiler/orbit-idl-backend.c \ + ${WRKSRC}/src/orb/orb-core/orbit-typelib.c post-install: @${ECHO_CMD} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbit2rc.default diff --git a/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c b/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c new file mode 100644 index 000000000..dcc0e0ebb --- /dev/null +++ b/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c @@ -0,0 +1,11 @@ +--- src/idl-compiler/orbit-idl-backend.c.orig Tue Oct 1 23:32:46 2002 ++++ src/idl-compiler/orbit-idl-backend.c Sun May 11 20:51:19 2003 +@@ -38,6 +38,8 @@ + char **strv; + int i; + ++ paths = g_slist_prepend (paths, "/usr/X11R6/lib/orbit-2.0/idl-backends"); ++ + if (!(val = getenv ("GNOME2_PATH"))) + return paths; + diff --git a/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c b/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c new file mode 100644 index 000000000..5295e00ad --- /dev/null +++ b/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c @@ -0,0 +1,11 @@ +--- src/orb/orb-core/orbit-typelib.c.orig Sun May 11 20:37:14 2003 ++++ src/orb/orb-core/orbit-typelib.c Sun May 11 20:40:42 2003 +@@ -215,6 +215,8 @@ + paths = g_ptr_array_sized_new (8); + + g_ptr_array_add (paths, g_strdup (ORBIT_TYPELIB_DIR)); ++ add_if_unique(paths, "%%X11BASE%%"); ++ add_if_unique(paths, "%%LOCALBASE%%"); + + if ((path = g_getenv ("ORBIT_TYPELIB_PATH"))) { + char **strv; |