 @@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.4 2008/02/23 11:39:17 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/02/28 20:59:03 drochner Exp $
+#
-DISTNAME=	notecase-1.7.6_src
+DISTNAME=	notecase-1.8.1_src
-PKGNAME=	notecase-1.7.6
+PKGNAME=	notecase-1.8.1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=notecase/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://notecase.sourceforge.net/
 COMMENT=	Hierarchical note manager
-WRKSRC=		${WRKDIR}/notecase-1.7.6
+WRKSRC=		${WRKDIR}/notecase-1.8.1
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake msgfmt pkg-config gsed
 TOOLS_PLATFORM.gsed= #empty, override nonsense in tools
 USE_DIRS+=	xdg-1.1
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/notecase
 	${INSTALL_DATA_DIR} ${PREFIX}/share/locale/fr_CA/LC_MESSAGES
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"

 @@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.3 2008/01/09 19:09:23 drochner Exp $
+$NetBSD: distinfo,v 1.4 2008/02/28 20:59:03 drochner Exp $
-SHA1 (notecase-1.7.6_src.tar.gz) = 5ce29214bb534fad1492538c8ca9032235add50e
+SHA1 (notecase-1.8.1_src.tar.gz) = d19f09e781fc0d8552b20d4ae607110f00935751
-RMD160 (notecase-1.7.6_src.tar.gz) = 1d14013a03f891c0228d23d941447caaa1589246
+RMD160 (notecase-1.8.1_src.tar.gz) = 602ec3112ac1ff191aaa074cef2ddc06894e3757
-Size (notecase-1.7.6_src.tar.gz) = 878978 bytes
+Size (notecase-1.8.1_src.tar.gz) = 883359 bytes
 SHA1 (patch-aa) = c7f1734e0741fdd5c1280012391a425291bd7300
 SHA1 (patch-ab) = 360a714e1642102ee113c881d97ad787f37e7630
 SHA1 (patch-ac) = 638b0cb716c8107f2d3fb243a2c0e6f6b75cc3c3
-SHA1 (patch-ad) = 3d87b9b412453134b502d0d777f359519aa25b02
+SHA1 (patch-ad) = d7f961d751d3925b2f63ac98cbd7be46dd307389
-SHA1 (patch-ae) = f74a3bd32df5959c54851bbc04bbf4eaa2d589e8
+SHA1 (patch-ae) = 355b89d234a95697c5344bbfe24d347e9cd630f7
 SHA1 (patch-af) = eab3d1dfa00cb2eed49b4a08ad780d295b9a9dda
 SHA1 (patch-ag) = 376e7c934beb5b666503b92e970695ece879d4cc
 SHA1 (patch-ah) = cb8cca8e9980f13a6e3c4b1731fa1ae17136dd09
-SHA1 (patch-ai) = b19383a2933da9c2ef9932d145a7c158f666d475
+SHA1 (patch-ai) = c4d20d4a2a842ffe604bd923b200430336ae52bd

 @@ -1,48 +1,48 @@
-$NetBSD: patch-ad,v 1.3 2008/01/09 19:09:23 drochner Exp $
+$NetBSD: patch-ad,v 1.4 2008/02/28 20:59:03 drochner Exp $
---- Makefile.orig	2008-01-08 20:24:20.000000000 +0100
+--- Makefile.orig	2008-02-27 10:24:44.000000000 +0100
 +++ Makefile
 @@ -10,7 +10,7 @@
- VERSION=1.7.6
+ VERSION=1.8.1
  # define install target dirs
 -prefix=/usr
 +prefix=${PREFIX}
  bindir=$(prefix)/bin
  datadir=$(prefix)/share
-@@ -112,7 +112,7 @@ FLAGS=$(CFLAGS)
+@@ -125,7 +125,7 @@ BIN=./bin
  BIN=./bin
  OBJ=./bin
  #define proper install flags
 -INSTALL=install -D
 +INSTALL=install -c
  ifdef OSX_BUILD
   INSTALL=install -c
  endif
-@@ -140,7 +140,7 @@ CC=$(QC) $(CXX) $(DEBUG) $(PROFILE) -DEN
+@@ -164,7 +164,7 @@ CC=$(QC) $(CXX) $(DEBUG) $(PROFILE) -DEN
  ifdef WINDIR
   LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -L$(OBJ) -lz
  else
 - LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -ldl
 + LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lz
  endif
  ifndef OSX_BUILD
-@@ -171,7 +171,6 @@ OBJS= $(OBJ)/main.o $(OBJ)/support.o $(O
+@@ -197,7 +197,6 @@ OBJS= $(OBJ)/main.o $(OBJ)/support.o $(O
   $(OBJ)/IOLayerRedirect.o $(OBJ)/FileExportDlg.o $(OBJ)/FormatIOTxt.o $(OBJ)/FindReplaceDlg.o \
   $(OBJ)/FindReplaceInfo.o $(OBJ)/LinkInfo.o $(OBJ)/LinkPropertiesDlg.o $(OBJ)/ExecuteFile.o \
   $(OBJ)/FileSaveAsDlg.o $(OBJ)/CircularBuffer.o $(OBJ)/FormatIOMMLX.o \
 - $(OBJ)/libz.a \
   $(OBJ)/ProgressDlg.o $(OBJ)/DocActionPix.o $(OBJ)/DocActionFinish.o $(OBJ)/DocActionFmt.o $(OBJ)/FmtInfo.o \
   $(OBJ)/FileAttachmentDlg.o $(OBJ)/DocActionAtt.o $(OBJ)/PixPropertiesDlg.o $(OBJ)/DocActionFinishDel.o \
   $(OBJ)/ShortcutsList.o $(OBJ)/ShortcutsListDlg.o $(OBJ)/DateTimeDlg.o $(OBJ)/AboutDlg.o $(OBJ)/EditDlg.o \
-@@ -599,7 +598,7 @@ updatesrc:
+@@ -626,7 +625,7 @@ updatesrc:
- 	$(Q)sed -i 's/^Version:.*/Version:        $(VERSION)/' ./docs/notecase.spec
+ 	$(Q)$(SED) 's/^Version:.*/Version:        $(VERSION)/' ./docs/notecase.spec
- 	$(Q)sed -i 's/^Source:.*/Source:         $(archive)_src.tar.gz/' ./docs/notecase.spec
+ 	$(Q)$(SED) 's/^Source:.*/Source:         $(archive)_src.tar.gz/' ./docs/notecase.spec
- 	$(Q)sed -i 's/\#define APP_VER_STR .*/\#define APP_VER_STR "$(VERSION)"/' ./src/config.h
+ 	$(Q)$(SED) 's/\#define APP_VER_STR .*/\#define APP_VER_STR "$(VERSION)"/' ./src/config.h
--	#$(Q)sed -i 's:\#define INSTALL_PREFIX .*:\#define INSTALL_PREFIX "$(DESTDIR)$(prefix)":' ./src/config.h
+-	#$(Q)$(SED) 's:\#define INSTALL_PREFIX .*:\#define INSTALL_PREFIX "$(DESTDIR)$(prefix)":' ./src/config.h
-+	$(Q)sed -i 's:\#define INSTALL_PREFIX .*:\#define INSTALL_PREFIX "$(DESTDIR)$(prefix)":' ./src/config.h
++	$(Q)$(SED) 's:\#define INSTALL_PREFIX .*:\#define INSTALL_PREFIX "$(DESTDIR)$(prefix)":' ./src/config.h
  	$(Q)if [ "$(HAVE_GNOME_VFS)" = "" ]; then \
- 		sed -i 's:[/]*#define HAVE_GNOME_VFS.*://#define HAVE_GNOME_VFS:' ./src/config.h; \
+ 		$(SED) 's:[/]*#define HAVE_GNOME_VFS.*://#define HAVE_GNOME_VFS:' ./src/config.h; \
  	else \

 @@ -1,27 +1,27 @@
-$NetBSD: patch-ae,v 1.1.1.1 2007/11/22 20:50:09 drochner Exp $
+$NetBSD: patch-ae,v 1.2 2008/02/28 20:59:03 drochner Exp $
---- src/lib/FilePath.cpp.orig	2007-07-31 07:47:28.000000000 +0200
+--- src/lib/FilePath.cpp.orig	2008-02-25 11:38:32.000000000 +0100
 +++ src/lib/FilePath.cpp
 @@ -23,6 +23,8 @@
   #include <unistd.h>
  #endif
 +#include "../config.h"
++
  #define PATH_DELIMITERS "\\/"
- std::string GetHomeDir()
+ std::string GetTempDirectory()
-@@ -95,31 +97,7 @@ std::string GetAppPath()
+@@ -106,31 +108,7 @@ std::string GetAppPath()
          ::GetModuleFileName(NULL, buf, 511);
          path = buf;
  #else
 -		//code adapted from public domain code by Nicolai Haehnle <prefect_@gmx.net>
 - 		char linkname[64]; /* /proc/<pid>/exe */
 -		int ret;
+-
 -		/* Get our PID and build the name of the link in /proc */
 -		pid_t pid = getpid();
+-
 -		if (snprintf(linkname, sizeof(linkname), "/proc/%i/exe", pid) < 0)
 -			return path; //error
+-

 @@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1 2008/01/09 19:09:23 drochner Exp $
+$NetBSD: patch-ai,v 1.2 2008/02/28 20:59:03 drochner Exp $
---- po/it.po.orig	2008-01-09 13:44:20.000000000 +0100
+--- po/it.po.orig	2008-02-05 22:21:34.000000000 +0100
 +++ po/it.po
-@@ -408,7 +408,7 @@ msgstr ""
+@@ -412,7 +412,7 @@ msgstr ""
- #: callbacks.cpp:5877
+ #: callbacks.cpp:5919
  #: FileAttachmentDlg.cpp:592
  msgid "Failed to open input file!\n"
 -msgstr "Errore nell'apertura del file di input!"
 +msgstr "Errore nell'apertura del file di input!\n"
- #: callbacks.cpp:5891
+ #: callbacks.cpp:5933
  #: FileAttachmentDlg.cpp:292