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

Update to 0.7.2

Browse Source
This commit is contained in:
giovanni 2010-05-04 07:25:54 +00:00
parent 13319df707
commit 4344db0111
6 changed files with 41 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x11/emelfm2/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2009/12/21 20:46:01 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.10 2010/05/04 07:25:54 giovanni Exp $
COMMENT = GTK+2 file manager
DISTNAME = emelfm2-0.6.2
PKGNAME = ${DISTNAME}p0
DISTNAME = emelfm2-0.7.2
CATEGORIES = x11
HOMEPAGE = http://emelfm2.net/
@ -26,14 +25,15 @@ MODULES = devel/gettext
WANTLIB = c cairo glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender atk-1.0 expat fontconfig \
freetype gio-2.0 glitz pangoft2-1.0 pixman-1 png xcb \
m pango-1.0 pangocairo-1.0 pthread pthread-stubs z
freetype gio-2.0 glitz pixman-1 png xcb pangoft2-1.0 \
m pthread pthread-stubs z pango-1.0 pangocairo-1.0 \
xcb-render xcb-render-util
BUILD_DEPENDS = ::devel/libmagic
RUN_DEPENDS = ::devel/desktop-file-utils \
::devel/xdg-utils
MAKE_ENV = CC=${CC} USE_LATEST=1
MAKE_ENV = CC=${CC}
USE_X11 = Yes
USE_GMAKE = Yes
NO_REGRESS = Yes

10
x11/emelfm2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (emelfm2-0.6.2.tar.bz2) = +wfverz1OFSXKxDVO8MRJg==
RMD160 (emelfm2-0.6.2.tar.bz2) = 2vjKIf1TqIeZvc4ok+hb2nZslJU=
SHA1 (emelfm2-0.6.2.tar.bz2) = 8681BBHJ7bS4O4CBZwbd1OcwlgU=
SHA256 (emelfm2-0.6.2.tar.bz2) = zNzMMpE6Jaw5h2D4FXBcDYoFjkuy3wPLfceqHoMznhc=
SIZE (emelfm2-0.6.2.tar.bz2) = 1032280
MD5 (emelfm2-0.7.2.tar.bz2) = QlM7TMMVCZ/USgUKJcxv4g==
RMD160 (emelfm2-0.7.2.tar.bz2) = AyLbeF7Q+xILnXUt4MxQQ9MWX30=
SHA1 (emelfm2-0.7.2.tar.bz2) = JgiaEcqGPVcorHWc7PUwbz6uK7o=
SHA256 (emelfm2-0.7.2.tar.bz2) = DmVdghKj8wAqM3hjsuhB9M7f7x3HBJOVNSeDksPP6RI=
SIZE (emelfm2-0.7.2.tar.bz2) = 1053920

36
x11/emelfm2/patches/patch-Makefile
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-Makefile,v 1.4 2009/08/17 12:14:52 giovanni Exp $
--- Makefile.orig Mon Jul 20 01:29:58 2009
+++ Makefile Mon Aug 17 11:12:34 2009
@@ -133,7 +133,7 @@ LIBS_XOBJECTS = $(LIBS_XSOURCES:%.c=$(OBJECTS_DIR)/%.s
$OpenBSD: patch-Makefile,v 1.5 2010/05/04 07:25:54 giovanni Exp $
--- Makefile.orig Wed Mar 3 12:57:22 2010
+++ Makefile Mon Apr 12 19:48:30 2010
@@ -140,7 +140,7 @@ LIBS_XOBJECTS = $(LIBS_XSOURCES:%.c=$(OBJECTS_DIR)/%.s
LIBS_XDEP_FILES = $(LIBS_XSOURCES:%.c=$(OBJECTS_DIR)/%.deps)
# set up flags
-lCFLAGS = $(CFLAGS)
+lCFLAGS = ${CFLAGS}
ifeq ($(USE_LATEST), 1)
#these are redundant now
#lCFLAGS += -DGTK_DISABLE_DEPRECATED
#lCFLAGS += -DGDK_DISABLE_DEPRECATED
@@ -217,7 +217,7 @@ lLIBS_CFLAGS = -shared -fPIC -DPIC
@@ -228,7 +228,7 @@ lLIBS_CFLAGS = -shared -fPIC -DPIC
#setup linking
# -lrt needed for clock_gettime()
@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/08/17 12:14:52 giovanni Exp $
ifeq ($(USE_FAM),1)
lLIBS += -lfam
endif
@@ -247,7 +247,7 @@ all: $(OBJECTS_DIR) $(BUILD_FILE) $(TARGET) $(LIBS) $(
@@ -258,7 +258,7 @@ all: $(OBJECTS_DIR) $(BUILD_FILE) $(TARGET) $(LIBS) $(
plugins: $(OBJECTS_DIR)/$(LIBS) $(LIBS_OBJECTS) $(LIBS_XOBJECTS)
@ -28,7 +28,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/08/17 12:14:52 giovanni Exp $
@echo "installing $(TARGET) to prefix '$(PREFIX)'"
@install -d -m 755 $(BIN_DIR)
@install -m 755 $(TARGET) $(BIN_DIR)
@@ -259,8 +259,7 @@ install: all install_plugins
@@ -270,8 +270,7 @@ install: all install_plugins
@for file in `ls $(DOCS)/ |grep -v svn |grep -v desktop_environment |grep -v api |grep -v $(TARGET).1`; do \
install -m 644 $(DOCS)/$$file $(DOC_DIR); \
done
@ -37,8 +37,8 @@ $OpenBSD: patch-Makefile,v 1.4 2009/08/17 12:14:52 giovanni Exp $
+ @install -m 644 $(DOCS)/$(TARGET).1 $(PREFIX)/man/man1;
# @bzip2 -f $(MAN_DIR)/$(TARGET).1;
ifeq ($(XDG_INTEGRATION), 1)
@@ -324,7 +323,7 @@ clean_plugins:
@if [ "`grep "#define E2_XDG" $(BUILD_FILE)`" = "#define E2_XDG" ]; then \
@@ -336,7 +335,7 @@ clean_plugins:
$(TARGET): $(OBJECTS)
@echo "linking binary '$(TARGET)'"
@ -47,7 +47,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/08/17 12:14:52 giovanni Exp $
ifeq ($(STRIP), 1)
ifneq ($(DEBUG), 1)
@echo "stripping binary '$(TARGET)'"
@@ -334,11 +333,11 @@ endif
@@ -346,11 +345,11 @@ endif
$(OBJECTS): $(OBJECTS_DIR)/%.o: %.c
@echo "compiling '$*.c'"
@ -61,7 +61,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/08/17 12:14:52 giovanni Exp $
ifeq ($(STRIP), 1)
ifneq ($(DEBUG), 1)
@strip -g $@
@@ -347,7 +346,7 @@ endif
@@ -359,7 +358,7 @@ endif
$(THUMBS_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
@echo "compiling '$*.c'"
@ -70,7 +70,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/08/17 12:14:52 giovanni Exp $
ifeq ($(STRIP), 1)
ifneq ($(DEBUG), 1)
@strip -g $@
@@ -356,7 +355,7 @@ endif
@@ -368,7 +367,7 @@ endif
$(ACL_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
@echo "compiling '$*.c'"
@ -79,7 +79,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/08/17 12:14:52 giovanni Exp $
ifeq ($(STRIP), 1)
ifneq ($(DEBUG), 1)
@strip -g $@
@@ -365,7 +364,7 @@ endif
@@ -377,7 +376,7 @@ endif
$(TRACKER_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
@echo "compiling '$*.c'"
@ -88,7 +88,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/08/17 12:14:52 giovanni Exp $
ifeq ($(STRIP), 1)
ifneq ($(DEBUG), 1)
@strip -g $@
@@ -374,7 +373,7 @@ endif
@@ -386,7 +385,7 @@ endif
$(VFS_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
@echo "compiling '$*.c'"
@ -97,7 +97,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/08/17 12:14:52 giovanni Exp $
ifeq ($(STRIP), 1)
ifneq ($(DEBUG), 1)
@strip -g $@
@@ -386,27 +385,27 @@ $(DEP_FILES): $(OBJECTS_DIR)
@@ -398,27 +397,27 @@ $(DEP_FILES): $(OBJECTS_DIR)
$(DEP_FILES): $(BUILD_FILE)
$(DEP_FILES): $(OBJECTS_DIR)/%.deps: %.c
@echo "generating '$@'"
@ -129,8 +129,8 @@ $OpenBSD: patch-Makefile,v 1.4 2009/08/17 12:14:52 giovanni Exp $
+ $(BIN_XGETTEXT) $(foreach dir, $(DIRS) $(LIBS) $(OPTLIBS), -D $(dir)) \
-p ./$(PO_DIR) --from-code=UTF-8 --no-wrap --omit-header -i -F \
--copyright-holder="$(COPYRIGHT)" --keyword=_ --keyword=N_ \
$(foreach file, $(SOURCES) $(HEADERS) $(LIBS_SOURCES) $(LIBS_HEADERS), $(shell basename $(file)))
@@ -465,7 +464,7 @@ help:
$(foreach file, $(SOURCES) $(HEADERS) $(LIBS_SOURCES) $(LIBS_HEADERS) \
@@ -478,7 +477,7 @@ help:
$(OBJECTS_DIR):
@echo "creating object directories in '$(OBJECTS_DIR)'"

8
x11/emelfm2/patches/patch-src_e2_output_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_e2_output_c,v 1.3 2009/05/06 16:20:01 giovanni Exp $
$OpenBSD: patch-src_e2_output_c,v 1.4 2010/05/04 07:25:54 giovanni Exp $
Don't include ctype, _C macro conflicts. Use glib func instead.
--- src/e2_output.c.orig Thu Apr 30 03:25:57 2009
+++ src/e2_output.c Wed May 6 17:25:13 2009
--- src/e2_output.c.orig Thu Nov 19 20:41:28 2009
+++ src/e2_output.c Mon Apr 12 19:47:33 2010
@@ -40,7 +40,6 @@ ToDo
#include "emelfm2.h"
#include <string.h>
@ -10,7 +10,7 @@ Don't include ctype, _C macro conflicts. Use glib func instead.
#include "e2_output.h"
#include "e2_dialog.h"
//for pane-text activation
@@ -621,7 +620,7 @@ nextchar:
@@ -635,7 +634,7 @@ nextchar:
break;
else if (g_unichar_isspace (d))
break;

17
x11/emelfm2/patches/patch-src_filesystem_e2_fs_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_filesystem_e2_fs_c,v 1.4 2009/08/17 12:14:52 giovanni Exp $
--- src/filesystem/e2_fs.c.orig Sat Jun 13 00:50:49 2009
+++ src/filesystem/e2_fs.c Fri Aug 14 10:52:08 2009
$OpenBSD: patch-src_filesystem_e2_fs_c,v 1.5 2010/05/04 07:25:54 giovanni Exp $
--- src/filesystem/e2_fs.c.orig Sun Dec 20 00:52:08 2009
+++ src/filesystem/e2_fs.c Mon Apr 12 19:47:33 2010
@@ -58,7 +58,7 @@ Not implemented yet.
#ifdef E2_VFS
#include "e2_plugins.h"
@ -10,16 +10,7 @@ $OpenBSD: patch-src_filesystem_e2_fs_c,v 1.4 2009/08/17 12:14:52 giovanni Exp $
#include "e2_complete.h"
#endif
@@ -2570,7 +2570,7 @@ is needed
gint e2_fs_writeflush (gint file_desc)
{
gint res;
- res = fdatasync (file_desc);
+ res = fsync (file_desc);
if (res == -1 && errno == EINVAL)
res = 0;
return res;
@@ -2645,7 +2645,7 @@ gboolean e2_fs_copy_file (VPATH *src, const struct sta
@@ -2676,7 +2676,7 @@ gboolean e2_fs_copy_file (VPATH *src, const struct sta
// blksize_t buf_size = 1048576;
//find a buffer up to 16 times dest block
//(compromise between accesses and multi-tasking latency)

8
x11/emelfm2/patches/patch-src_utils_e2_utils_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_utils_e2_utils_c,v 1.4 2009/08/17 12:14:52 giovanni Exp $
$OpenBSD: patch-src_utils_e2_utils_c,v 1.5 2010/05/04 07:25:54 giovanni Exp $
Our file(1) doesn't have all that fancy options.
--- src/utils/e2_utils.c.orig Tue Jul 7 12:07:45 2009
+++ src/utils/e2_utils.c Fri Aug 14 10:45:11 2009
@@ -550,7 +550,7 @@ gchar *e2_utils_get_mimetype (VPATH *localpath)
--- src/utils/e2_utils.c.orig Wed Oct 7 23:37:51 2009
+++ src/utils/e2_utils.c Mon Apr 12 19:47:33 2010
@@ -545,7 +545,7 @@ gchar *e2_utils_get_mimetype (VPATH *localpath)
}
#else
g_free (command);