diff -Nurd notecase-1.9.8/Makefile notecase-1.9.8.patched/Makefile --- notecase-1.9.8/Makefile 2008-12-09 05:07:06.000000000 -0500 +++ notecase-1.9.8.patched/Makefile 2011-11-15 15:45:21.000000000 -0500 @@ -10,7 +10,7 @@ VERSION=1.9.8 # define install target dirs -prefix=/usr +prefix=@FINKPREFIX@ bindir=$(prefix)/bin datadir=$(prefix)/share @@ -116,8 +116,8 @@ # properly calculate architecture ifdef HAVEDEB - ARCH=$(shell dpkg --print-architecture 2>/dev/null) - ifeq ($(ARCH),ppc-darwin) + ARCH=$(shell basename `dpkg --print-architecture 2>/dev/null` @OSVERSION@) + ifeq ($(ARCH),powerpc-apple-darwin) BYTE_ORDER=-DSHA1_BIG_ENDIAN -DORDER_ABCD OSX_BUILD=1 PLATFORM="OSX" @@ -163,7 +163,7 @@ CFLAGS += $(BYTE_ORDER) ifdef OSX_BUILD - EXE=.x11app +# EXE=.x11app endif FLAGS=$(CFLAGS) @@ -195,9 +195,9 @@ endif MD5SUM=md5sum -ifneq ($(OSX_BUILD),) - MD5SUM=gmd5sum -endif +#ifneq ($(OSX_BUILD),) +# MD5SUM=gmd5sum +#endif MD5SUM_EXISTS=$(shell which $(MD5SUM)) ifneq ($(SOLARIS_BUILD),) @@ -214,7 +214,7 @@ # using "--as-needed" to cut down link requirements (check by "readelf -d /usr/bin/notecase | grep NEEDED") ifeq ($(LDFLAGS),) ifdef OSX_BUILD - LDFLAGS=-Os -Wl -bind_at_load + LDFLAGS=-Os -Wl,-dead_strip_dylibs else LDFLAGS=-Os -Wl,--as-needed endif @@ -232,7 +232,7 @@ ifdef FREEBSD_BUILD LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) else - LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -ldl + LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -lintl -ldl -L@X11_BASE_DIR@/lib -lX11 endif endif diff -Nurd notecase-1.9.8/src/config.h notecase-1.9.8.patched/src/config.h --- notecase-1.9.8/src/config.h 2008-12-09 05:11:21.000000000 -0500 +++ notecase-1.9.8.patched/src/config.h 2011-11-15 15:40:50.000000000 -0500 @@ -41,14 +41,14 @@ //#define _OSX_BUILD //#define _NOKIA_MAEMO -#define INSTALL_PREFIX "/usr" +#define INSTALL_PREFIX "@FINKPREFIX@" #define HAVE_GNOME_VFS #endif #ifdef _WIN32 #define HELP_FILE_PATH "" //calculated dynamically #else - #define DOC_DIR_PATH "/usr/share/doc/notecase/" + #define DOC_DIR_PATH "#FINKPREFIX@/share/doc/notecase/" #define HELP_FILE_PATH "help.ncd" //relative to DOC_DIR_PATH #endif