update to 2.4.1.

done with bernd and ckuethe.
This commit is contained in:
steven 2006-07-07 16:43:10 +00:00
parent 728704992a
commit 61a1f85618
7 changed files with 49 additions and 268 deletions

View File

@ -1,16 +1,14 @@
# $OpenBSD: Makefile,v 1.29 2006/06/13 13:41:20 bernd Exp $
# $OpenBSD: Makefile,v 1.30 2006/07/07 16:43:10 steven Exp $
COMMENT= "gtk file manager with desktop features"
VERSION= 2.2.0
VERSION= 2.4.1
DISTNAME= rox-${VERSION}
PKGNAME= rox-filer-${VERSION}p3
PKGNAME= rox-filer-${VERSION}
CATEGORIES= x11
HOMEPAGE= http://rox.sourceforge.net/
MAINTAINER= Damien Couderc <couderc@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -21,12 +19,12 @@ WANTLIB= ICE SM X11 c fontconfig freetype z \
atk-1.0.0.0 pango-1.0.0.0 pangocairo-1.0.0.0 \
pangoft2-1.0.0.0 cairo
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
DISTFILES= ${DISTNAME}.tgz
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
EXTRACT_SUFX= .tgz
MODULES= devel/gettext
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \
${RUN_DEPENDS}
LIB_DEPENDS= gtk-x11-2.0.0.9,gdk_pixbuf-2.0.0.9,gdk-x11-2.0.0.9::x11/gtk+2 \
xml2::textproc/libxml
RUN_DEPENDS= ::misc/shared-mime-info
@ -36,6 +34,9 @@ FILE_TO_PATCH= ${WRKSRC}/ROX-Filer/src/choices.c
USE_X11= Yes
NO_REGRESS= Yes
INSTDATA= AppRun Help Messages Options.xml ROX images style.css \
subclasses .DirIcon
pre-configure:
@sed -e s:/usr/local/share/Choices:${PREFIX}/share/rox/Choices: \
${FILE_TO_PATCH} > ${FILE_TO_PATCH}.tmp && \
@ -43,17 +44,23 @@ pre-configure:
do-build:
@cd ${WRKSRC} && ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \
CPPFLAGS="-I${X11BASE}/include" with_platform="OpenBSD" \
ROX-Filer/AppRun --compile
do-install:
@rm -f ${WRKSRC}/ROX-Filer/src/*.orig
${INSTALL_DATA_DIR} ${PREFIX}/rox
${INSTALL_DATA_DIR} ${PREFIX}/rox/ROX-Filer
${INSTALL_MAN} ${WRKSRC}/rox.1 ${PREFIX}/man/man1/
${INSTALL_MAN} ${WRKSRC}/rox.1 ${PREFIX}/man/man1/ROX-Filer.1
${INSTALL_DATA_DIR} ${PREFIX}/share/rox/Choices/MIME-types
${INSTALL_SCRIPT} ${WRKSRC}/Choices/MIME-types/* ${PREFIX}/share/rox/Choices/MIME-types
@(cd ${WRKSRC}/ROX-Filer/src && make clean)
@cp -R ${WRKSRC}/ROX-Filer ${PREFIX}/rox
${INSTALL_SCRIPT} ${WRKSRC}/Choices/MIME-types/* \
${PREFIX}/share/rox/Choices/MIME-types
.for p in ROX-Filer ROX-Filer.dbg
${INSTALL_PROGRAM} ${WRKSRC}/ROX-Filer/$p ${PREFIX}/rox/ROX-Filer
.endfor
.for i in ${INSTDATA}
@cp -R ${WRKSRC}/ROX-Filer/$i ${PREFIX}/rox/ROX-Filer
.endfor
@echo '#!/bin/sh' > ${PREFIX}/bin/rox
@echo 'exec /usr/local/rox/ROX-Filer/AppRun "$$@"' >> ${PREFIX}/bin/rox
@chmod ugo+rx ${PREFIX}/bin/rox

View File

@ -1,4 +1,4 @@
MD5 (rox-2.2.0.tgz) = 0deefd9e7edd4e79cd0f18f423264ebb
RMD160 (rox-2.2.0.tgz) = 6fe46202ddd3f04c07a0eaaabde88eb776c535dd
SHA1 (rox-2.2.0.tgz) = 1653a11058eed9858bfd828392e9329c0ac39104
SIZE (rox-2.2.0.tgz) = 2033724
MD5 (rox-2.4.1.tgz) = 0d43b7fcd0325936fdf036230837f21b
RMD160 (rox-2.4.1.tgz) = 083facc66d10bce157eb1964c6387aac89b01013
SHA1 (rox-2.4.1.tgz) = 9e2fea71d1eb347200c23b28117651be7fccbcdc
SIZE (rox-2.4.1.tgz) = 2366048

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-ROX-Filer_AppRun,v 1.6 2004/05/31 13:38:53 couderc Exp $
--- ROX-Filer/AppRun.orig 2004-04-21 20:56:36.000000000 +0200
+++ ROX-Filer/AppRun 2004-05-31 15:26:56.000000000 +0200
@@ -6,10 +6,7 @@ APP_DIR=`dirname "$0"`
APP_DIR=`cd "$APP_DIR";pwd`; export APP_DIR
if [ "x$PLATFORM" = x ]; then
- ARCH=`uname -m`
- case "$ARCH" in
- i?86) ARCH=ix86 ;;
- esac
+ ARCH=`arch -s`
PLATFORM=`uname -s`-"$ARCH" export PLATFORM
fi

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ROX-Filer_src_config_h_in,v 1.1 2006/07/07 16:43:10 steven Exp $
--- ROX-Filer/src/config.h.in.orig Wed Jul 5 17:17:52 2006
+++ ROX-Filer/src/config.h.in Wed Jul 5 17:18:25 2006
@@ -54,7 +54,7 @@
/* printf format string to print file sizes */
#ifdef LARGE_FILE_SUPPORT
-# define SIZE_FMT G_GINT64_MODIFIER "d"
+# define SIZE_FMT "lld"
#else
# define SIZE_FMT G_GINT32_MODIFIER "d"
#endif

View File

@ -1,80 +0,0 @@
$OpenBSD: patch-ROX-Filer_src_configure,v 1.4 2005/04/12 18:07:47 couderc Exp $
--- ROX-Filer/src/configure.orig Sat Jan 29 13:52:43 2005
+++ ROX-Filer/src/configure Wed Mar 16 20:58:45 2005
@@ -831,20 +831,20 @@ else
fi
-echo $ac_n "checking for GNOME VFS 2.8 or later""... $ac_c" 1>&6
-echo "configure:836: checking for GNOME VFS 2.8 or later" >&5
-if "$PKG_CONFIG" --atleast-version=2.8.0 "gnome-vfs-2.0" ; then
- LIBS="$LIBS `$PKG_CONFIG --libs gnome-vfs-2.0`"
- CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gnome-vfs-2.0`"
- cat >> confdefs.h <<\EOF
-#define HAVE_GNOME_VFS 1
-EOF
+#echo $ac_n "checking for GNOME VFS 2.8 or later""... $ac_c" 1>&6
+#echo "configure:836: checking for GNOME VFS 2.8 or later" >&5
+#if "$PKG_CONFIG" --atleast-version=2.8.0 "gnome-vfs-2.0" ; then
+# LIBS="$LIBS `$PKG_CONFIG --libs gnome-vfs-2.0`"
+# CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gnome-vfs-2.0`"
+# cat >> confdefs.h <<\EOF
+##define HAVE_GNOME_VFS 1
+#EOF
+#
+# echo "$ac_t""yes" 1>&6
+#else
+# echo "$ac_t""no" 1>&6
+#fi
- echo "$ac_t""yes" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
GTK_VERSION=`"$PKG_CONFIG" --modversion gtk+-2.0`
cat >> confdefs.h <<EOF
#define GTK_VERSION "$GTK_VERSION"
@@ -2380,42 +2380,6 @@ else
echo "$ac_t""no" 1>&6
fi
done
-
-
-ac_safe=`echo "X11/SM/SMlib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for X11/SM/SMlib.h""... $ac_c" 1>&6
-echo "configure:2388: checking for X11/SM/SMlib.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2393 "configure"
-#include "confdefs.h"
-#include <X11/SM/SMlib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-{ echo "configure: error: Session management library (libsm) missing. It is part of the X server distribution. Try installing the libsm-dev package." 1>&2; exit 1; }
-
-fi
echo $ac_n "checking for working const""... $ac_c" 1>&6

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ROX-Filer_src_pixmaps_c,v 1.5 2005/01/31 19:01:47 couderc Exp $
--- ROX-Filer/src/pixmaps.c.orig Sun Jan 16 17:48:02 2005
+++ ROX-Filer/src/pixmaps.c Mon Jan 31 18:23:41 2005
@@ -385,7 +385,7 @@ void pixmap_background_thumb(const gchar
$OpenBSD: patch-ROX-Filer_src_pixmaps_c,v 1.6 2006/07/07 16:43:10 steven Exp $
--- ROX-Filer/src/pixmaps.c.orig Thu Dec 29 11:14:34 2005
+++ ROX-Filer/src/pixmaps.c Fri Jun 30 10:47:12 2006
@@ -383,7 +383,7 @@ void pixmap_background_thumb(const gchar
execl(thumb_prog, thumb_prog, path,
thumbnail_path(path),
g_strdup_printf("%d", PIXMAP_THUMB_SIZE),

View File

@ -1,13 +1,11 @@
@comment $OpenBSD: PLIST,v 1.15 2006/01/20 13:12:03 steven Exp $
@comment $OpenBSD: PLIST,v 1.16 2006/07/07 16:43:10 steven Exp $
bin/rox
@man man/man1/ROX-Filer.1
@man man/man1/rox.1
rox/
rox/ROX-Filer/
rox/ROX-Filer/.DirIcon
rox/ROX-Filer/AppInfo.xml
rox/ROX-Filer/AppRun
@comment rox/ROX-Filer/AppRun.orig
rox/ROX-Filer/Help/
rox/ROX-Filer/Help/COPYING
rox/ROX-Filer/Help/Changes
@ -23,6 +21,8 @@ rox/ROX-Filer/Messages/cs.gmo
rox/ROX-Filer/Messages/da.gmo
rox/ROX-Filer/Messages/de.gmo
rox/ROX-Filer/Messages/es.gmo
rox/ROX-Filer/Messages/et_EE.gmo
rox/ROX-Filer/Messages/eu.gmo
rox/ROX-Filer/Messages/fi.gmo
rox/ROX-Filer/Messages/fr.gmo
rox/ROX-Filer/Messages/hu.gmo
@ -32,16 +32,16 @@ rox/ROX-Filer/Messages/nl.gmo
rox/ROX-Filer/Messages/no.gmo
rox/ROX-Filer/Messages/pl.gmo
rox/ROX-Filer/Messages/pt_BR.gmo
rox/ROX-Filer/Messages/pt_PT.gmo
rox/ROX-Filer/Messages/ro.gmo
rox/ROX-Filer/Messages/ru.gmo
rox/ROX-Filer/Messages/sv.gmo
rox/ROX-Filer/Messages/zh_CN.gmo
rox/ROX-Filer/Messages/zh_TW.gmo
rox/ROX-Filer/OpenBSD-${MACHINE_ARCH}/
rox/ROX-Filer/OpenBSD-${MACHINE_ARCH}/ROX-Filer
rox/ROX-Filer/OpenBSD-${MACHINE_ARCH}/ROX-Filer.dbg
rox/ROX-Filer/Options.xml
rox/ROX-Filer/ROX/
rox/ROX-Filer/ROX-Filer
rox/ROX-Filer/ROX-Filer.dbg
rox/ROX-Filer/ROX/MIME/
rox/ROX-Filer/ROX/MIME/mime-application.png
rox/ROX-Filer/ROX/MIME/mime-application:pdf.png
@ -87,7 +87,6 @@ rox/ROX-Filer/ROX/MIME/mime-application:x-java.png
rox/ROX-Filer/ROX/MIME/mime-application:x-lyx.png
rox/ROX-Filer/ROX/MIME/mime-application:x-object.png
rox/ROX-Filer/ROX/MIME/mime-application:x-perl.png
rox/ROX-Filer/ROX/MIME/mime-application:x-python.png
rox/ROX-Filer/ROX/MIME/mime-application:x-rpm.png
rox/ROX-Filer/ROX/MIME/mime-application:x-sharedlib.png
rox/ROX-Filer/ROX/MIME/mime-application:x-shellscript.png
@ -117,6 +116,7 @@ rox/ROX-Filer/ROX/MIME/mime-inode:directory.png
rox/ROX-Filer/ROX/MIME/mime-inode:fifo.png
rox/ROX-Filer/ROX/MIME/mime-inode:mount-point.png
rox/ROX-Filer/ROX/MIME/mime-inode:socket.png
rox/ROX-Filer/ROX/MIME/mime-message.png
rox/ROX-Filer/ROX/MIME/mime-text.png
rox/ROX-Filer/ROX/MIME/mime-text:html.png
rox/ROX-Filer/ROX/MIME/mime-text:x-c++src.png
@ -125,6 +125,7 @@ rox/ROX-Filer/ROX/MIME/mime-text:x-csrc.png
rox/ROX-Filer/ROX/MIME/mime-text:x-diff.png
rox/ROX-Filer/ROX/MIME/mime-text:x-java.png
rox/ROX-Filer/ROX/MIME/mime-text:x-makefile.png
rox/ROX-Filer/ROX/MIME/mime-text:x-python.png
rox/ROX-Filer/ROX/MIME/mime-text:x-tcl.png
rox/ROX-Filer/ROX/MIME/mime-text:x-tex.png
rox/ROX-Filer/ROX/MIME/mime-text:xml.png
@ -132,12 +133,6 @@ rox/ROX-Filer/ROX/MIME/mime-video.png
rox/ROX-Filer/ROX/MIME/mime-video:mpeg.png
rox/ROX-Filer/ROX/MIME/mime-video:quicktime.png
rox/ROX-Filer/ROX/index.theme
rox/ROX-Filer/build/
rox/ROX-Filer/build/Makefile
rox/ROX-Filer/build/config.cache
rox/ROX-Filer/build/config.h
rox/ROX-Filer/build/config.log
rox/ROX-Filer/build/config.status
rox/ROX-Filer/images/
rox/ROX-Filer/images/application.png
rox/ROX-Filer/images/dirs.png
@ -149,146 +144,8 @@ rox/ROX-Filer/images/rox-show-details.png
rox/ROX-Filer/images/rox-show-hidden.png
rox/ROX-Filer/images/rox-xattr.png
rox/ROX-Filer/images/symlink.png
rox/ROX-Filer/src/
rox/ROX-Filer/src/Docs/
rox/ROX-Filer/src/Docs/Makefile
rox/ROX-Filer/src/Docs/Manual-fr.xml
rox/ROX-Filer/src/Docs/Manual-it.xml
rox/ROX-Filer/src/Docs/Manual.xml
rox/ROX-Filer/src/Docs/to_html.xsl
rox/ROX-Filer/src/Docs/to_man.xsl
rox/ROX-Filer/src/Makefile
rox/ROX-Filer/src/Makefile.in
rox/ROX-Filer/src/abox.c
rox/ROX-Filer/src/abox.h
rox/ROX-Filer/src/action.c
rox/ROX-Filer/src/action.h
rox/ROX-Filer/src/appinfo.c
rox/ROX-Filer/src/appinfo.h
rox/ROX-Filer/src/appmenu.c
rox/ROX-Filer/src/appmenu.h
rox/ROX-Filer/src/bind.c
rox/ROX-Filer/src/bind.h
rox/ROX-Filer/src/bookmarks.c
rox/ROX-Filer/src/bookmarks.h
rox/ROX-Filer/src/bulk_rename.c
rox/ROX-Filer/src/bulk_rename.h
rox/ROX-Filer/src/cell_icon.c
rox/ROX-Filer/src/cell_icon.h
rox/ROX-Filer/src/choices.c
rox/ROX-Filer/src/choices.h
rox/ROX-Filer/src/collection.c
rox/ROX-Filer/src/collection.h
rox/ROX-Filer/src/config.h.in
rox/ROX-Filer/src/configure
rox/ROX-Filer/src/configure.in
rox/ROX-Filer/src/dir.c
rox/ROX-Filer/src/dir.h
rox/ROX-Filer/src/diritem.c
rox/ROX-Filer/src/diritem.h
rox/ROX-Filer/src/display.c
rox/ROX-Filer/src/display.h
rox/ROX-Filer/src/dnd.c
rox/ROX-Filer/src/dnd.h
rox/ROX-Filer/src/dropbox.c
rox/ROX-Filer/src/dropbox.h
rox/ROX-Filer/src/filer.c
rox/ROX-Filer/src/filer.h
rox/ROX-Filer/src/find.c
rox/ROX-Filer/src/find.h
rox/ROX-Filer/src/fscache.c
rox/ROX-Filer/src/fscache.h
rox/ROX-Filer/src/global.h
rox/ROX-Filer/src/gtkicontheme.c
rox/ROX-Filer/src/gtkicontheme.h
rox/ROX-Filer/src/gtkiconthemeparser.c
rox/ROX-Filer/src/gtkiconthemeparser.h
rox/ROX-Filer/src/gtksavebox.c
rox/ROX-Filer/src/gtksavebox.h
rox/ROX-Filer/src/gui_support.c
rox/ROX-Filer/src/gui_support.h
rox/ROX-Filer/src/i18n.c
rox/ROX-Filer/src/i18n.h
rox/ROX-Filer/src/icon.c
rox/ROX-Filer/src/icon.h
rox/ROX-Filer/src/infobox.c
rox/ROX-Filer/src/infobox.h
rox/ROX-Filer/src/main.c
rox/ROX-Filer/src/main.h
rox/ROX-Filer/src/makedist
rox/ROX-Filer/src/menu.c
rox/ROX-Filer/src/menu.h
rox/ROX-Filer/src/minibuffer.c
rox/ROX-Filer/src/minibuffer.h
rox/ROX-Filer/src/modechange.c
rox/ROX-Filer/src/modechange.h
rox/ROX-Filer/src/mount.c
rox/ROX-Filer/src/mount.h
rox/ROX-Filer/src/my_vfs.h
rox/ROX-Filer/src/options.c
rox/ROX-Filer/src/options.h
rox/ROX-Filer/src/panel.c
rox/ROX-Filer/src/panel.h
rox/ROX-Filer/src/pinboard.c
rox/ROX-Filer/src/pinboard.h
rox/ROX-Filer/src/pixmaps.c
rox/ROX-Filer/src/pixmaps.h
rox/ROX-Filer/src/po/
rox/ROX-Filer/src/po/cs.po
rox/ROX-Filer/src/po/da.po
rox/ROX-Filer/src/po/de.po
rox/ROX-Filer/src/po/dist
rox/ROX-Filer/src/po/es.po
rox/ROX-Filer/src/po/fi.po
rox/ROX-Filer/src/po/fr.po
rox/ROX-Filer/src/po/hu.po
rox/ROX-Filer/src/po/it.po
rox/ROX-Filer/src/po/ja.po
rox/ROX-Filer/src/po/make-mo
rox/ROX-Filer/src/po/nl.po
rox/ROX-Filer/src/po/no.po
rox/ROX-Filer/src/po/pl.po
rox/ROX-Filer/src/po/pt_BR.po
rox/ROX-Filer/src/po/ro.po
rox/ROX-Filer/src/po/ru.po
rox/ROX-Filer/src/po/sv.po
rox/ROX-Filer/src/po/tips.py
rox/ROX-Filer/src/po/update-po
rox/ROX-Filer/src/po/zh_CN.po
rox/ROX-Filer/src/po/zh_TW.po
rox/ROX-Filer/src/remote.c
rox/ROX-Filer/src/remote.h
rox/ROX-Filer/src/rox_gettext.c
rox/ROX-Filer/src/rox_gettext.h
rox/ROX-Filer/src/run.c
rox/ROX-Filer/src/run.h
rox/ROX-Filer/src/sc.c
rox/ROX-Filer/src/sc.h
rox/ROX-Filer/src/session.c
rox/ROX-Filer/src/session.h
rox/ROX-Filer/src/support.c
rox/ROX-Filer/src/support.h
rox/ROX-Filer/src/tasklist.c
rox/ROX-Filer/src/tasklist.h
rox/ROX-Filer/src/toolbar.c
rox/ROX-Filer/src/toolbar.h
rox/ROX-Filer/src/type.c
rox/ROX-Filer/src/type.h
rox/ROX-Filer/src/usericons.c
rox/ROX-Filer/src/usericons.h
rox/ROX-Filer/src/view_collection.c
rox/ROX-Filer/src/view_collection.h
rox/ROX-Filer/src/view_details.c
rox/ROX-Filer/src/view_details.h
rox/ROX-Filer/src/view_iface.c
rox/ROX-Filer/src/view_iface.h
rox/ROX-Filer/src/wrapped.c
rox/ROX-Filer/src/wrapped.h
rox/ROX-Filer/src/xml.c
rox/ROX-Filer/src/xml.h
rox/ROX-Filer/src/xtypes.c
rox/ROX-Filer/src/xtypes.h
rox/ROX-Filer/style.css
rox/ROX-Filer/subclasses
share/rox/
share/rox/Choices/
share/rox/Choices/MIME-types/