7 files changed, 65 insertions, 132 deletions

diff --git a/deskutils/notecase/Makefile b/deskutils/notecase/Makefile
index 9f1f484af2d6..dbb935ce9d69 100644
--- a/deskutils/notecase/Makefile
+++ b/deskutils/notecase/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	notecase
-PORTVERSION=	1.5.8
+PORTVERSION=	1.8.1
 CATEGORIES=	deskutils textproc
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}_src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	A hierarchical text notes manager
 
 USE_GMAKE=	yes
@@ -21,6 +21,7 @@ USE_GETTEXT=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .if !defined(NOPORTDOCS)
+PORTDOCS=	help.ncd license.txt
 INSTALL_TARGET=	install docinstall
 .endif
 
@@ -33,6 +34,8 @@ BROKEN=		Does not compile
 post-patch:
 	@${REINPLACE_CMD} -e 's|prefix=/usr|prefix=${PREFIX}|' \
 		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|docsdir=|docsdir=${DOCSDIR}|' \
+		${WRKSRC}/Makefile
 
 post-install:
 	@-update-mime-database ${PREFIX}/share/mime
diff --git a/deskutils/notecase/distinfo b/deskutils/notecase/distinfo
index a229b2587388..784177a20e4f 100644
--- a/deskutils/notecase/distinfo
+++ b/deskutils/notecase/distinfo
@@ -1,3 +1,3 @@
-MD5 (notecase-1.5.8_src.tar.gz) = 6e44c5e7bff2afdec36f63963fe18b20
-SHA256 (notecase-1.5.8_src.tar.gz) = b27ac143df957483fba88c98885551657377f173fb588ac1be395ffb0c92683f
-SIZE (notecase-1.5.8_src.tar.gz) = 667078
+MD5 (notecase-1.8.1_src.tar.gz) = 303f56e1929d069f805ef87abbff363e
+SHA256 (notecase-1.8.1_src.tar.gz) = 94f434f6e8c68136978fde763d375dd33e60676cc9d5737192b867318069c2f7
+SIZE (notecase-1.8.1_src.tar.gz) = 883359
diff --git a/deskutils/notecase/files/patch-Makefile b/deskutils/notecase/files/patch-Makefile
index 95b724170fb5..bfebdef433f6 100644
--- a/deskutils/notecase/files/patch-Makefile
+++ b/deskutils/notecase/files/patch-Makefile
@@ -1,109 +1,75 @@
---- Makefile.orig	Mon Jun 25 12:53:44 2007
-+++ Makefile	Thu Jul 19 18:41:38 2007
-@@ -80,7 +79,7 @@
- ifdef WINDIR
-  LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -L$(OBJ) -lz 
- else
-- LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -ldl -export-dynamic $(LOPTIMIZE)
-+ LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -export-dynamic $(LOPTIMIZE)
+--- Makefile.orig	2008-02-27 10:24:44.000000000 +0100
++++ Makefile	2008-03-20 17:06:20.445074259 +0100
+@@ -13,6 +13,7 @@
+ prefix=/usr
+ bindir=$(prefix)/bin
+ datadir=$(prefix)/share
++docsdir=
+ 
+ # define top of RPM build area
+ topdir=/usr/src/redhat
+@@ -129,12 +130,18 @@
+ ifdef OSX_BUILD
+  INSTALL=install -c
  endif 
++ifdef FREEBSD_BUILD
++ INSTALL=install
++endif 
  
- #
-@@ -360,7 +359,7 @@
- 	$(CC) $(FLAGS) -c $(GUIPATH)/DocActionFinishDel.cpp -o $(OBJ)/DocActionFinishDel.o $(GTKCFLAGS)
- 	
- $(OBJ)/libz.a:
--	@cd ./src/lib/zlib/; make; cp ./libz.a ../../../$(OBJ)/
-+	@cd ./src/lib/zlib/; gmake; cp ./libz.a ../../../$(OBJ)/
+ #define proper sed (use gnused for Darwin?)
+ SED=sed -i
+ ifneq ($(OSX_BUILD),)
+ 	SED=sed -i.bak
+ endif
++ifneq ($(FREEBSD_BUILD),)
++	SED=sed -i.bak
++endif
  
- $(OBJ)/ShortcutsList.o: $(GUIPATH)/ShortcutsList.cpp $(GUIPATH)/ShortcutsList.h
- 	$(CC) $(FLAGS) -c $(GUIPATH)/ShortcutsList.cpp -o $(OBJ)/ShortcutsList.o  $(GTKCFLAGS)
-@@ -405,7 +404,8 @@
+ MD5SUM=md5sum
+ ifneq ($(OSX_BUILD),)
+@@ -164,7 +171,7 @@
+ 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)
+ endif
+ 
+ ifndef OSX_BUILD 
+@@ -520,7 +527,7 @@
  		rm -f po/messages.mo; \
  		msgfmt $$i -o po/messages.mo; \
  		echo "Installing: $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo";\
--		install -D -m 644 po/messages.mo "$(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo"; \
-+		install -d $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES; \
-+		install -m 644 -c po/messages.mo "$(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo"; \
- 	done; \
- 	rm -f po/messages.mo; 
- 	@echo done installing translations
-@@ -413,16 +413,24 @@
+-		if [ "$(OSX_BUILD)" = "1" ]; then \
++		if [ "$(OSX_BUILD)" = "1" ] || [ "$(FREEBSD_BUILD)" = "1" ]; then \
+ 			mkdir -p $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/; \
+ 		fi; \
+ 		$(INSTALL) -m 644 po/messages.mo "$(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo"; \
+@@ -531,12 +538,17 @@
  pouninstall:
  	@rm -vf $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/notecase.mo
  	@echo done uninstalling translations
 -	
 +
 +docinstall:
-+	-install -d $(DESTDIR)$(datadir)/doc/notecase
-+	install -m 644 -c docs/help.ncd "$(DESTDIR)$(datadir)/doc/notecase/help.ncd"
-+	install -m 644 -c docs/license.txt "$(DESTDIR)$(datadir)/doc/notecase/license.txt"
++	mkdir -p $(docsdir)
++	$(INSTALL) -m 644 -c docs/help.ncd "$(docsdir)/help.ncd"
++	$(INSTALL) -m 644 -c docs/license.txt "$(docsdir)/license.txt"
 +
  #
  # install application
  #
  install: notecase$(EXE) poinstall
--	install -D -m 755 $(BIN)/notecase "$(DESTDIR)$(bindir)/notecase"
--	install -D -m 644 docs/help.ncd "$(DESTDIR)$(datadir)/doc/notecase/help.ncd"
--	install -D -m 644 docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/notecase.desktop"
--	install -D -m 644 docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml"
--	install -D -m 644 res/notecase.xpm "$(DESTDIR)$(datadir)/pixmaps/notecase.xpm"
-+	-install -d $(DESTDIR)$(bindir)
-+	install -m 755 -c $(BIN)/notecase "$(DESTDIR)$(bindir)/notecase"
-+	-install -d $(DESTDIR)$(datadir)/applications
-+	install -m 644 -c docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/notecase.desktop"
-+	-install -d $(DESTDIR)$(datadir)/mime/packages
-+	install -m 644 -c docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml"
-+	-install -d $(DESTDIR)$(datadir)/pixmaps
-+	install -m 644 -c res/notecase.xpm "$(DESTDIR)$(datadir)/pixmaps/notecase.xpm"
- 	@echo done installing
- 
- #
-@@ -474,23 +482,23 @@
- #   7. update version in the control file used to build Debian/Ubuntu .deb package
- #
- updatesrc:
--	$(Q)sed -i 's/^Version:.*/Version:        $(VERSION)/' ./docs/notecase.spec
--	$(Q)sed -i 's/^Source:.*/Source:         $(archive).tar.gz/' ./docs/notecase.spec
--	$(Q)sed -i '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 -i.bak 's/^Version:.*/Version:        $(VERSION)/' ./docs/notecase.spec
-+	$(Q)sed -i.bak 's/^Source:.*/Source:         $(archive).tar.gz/' ./docs/notecase.spec
-+	$(Q)sed -i.bak 's/\#define APP_VER_STR .*/\#define APP_VER_STR "$(VERSION)"/' ./src/config.h
-+	$(Q)sed -i.bak '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 -i.bak 's:[/]*#define HAVE_GNOME_VFS.*://#define HAVE_GNOME_VFS:' ./src/config.h; \
- 	else \
--		sed -i 's:[/]*#define HAVE_GNOME_VFS.*:#define HAVE_GNOME_VFS:' ./src/config.h; \
-+		sed -i.bak 's:[/]*#define HAVE_GNOME_VFS.*:#define HAVE_GNOME_VFS:' ./src/config.h; \
+-	$(Q)if [ "$(OSX_BUILD)" = "1" ]; then \
++	$(Q)if [ "$(OSX_BUILD)" = "1" ] || [ "$(FREEBSD_BUILD)" = "1" ]; then \
+ 		mkdir -p $(DESTDIR)$(bindir); \
+ 		mkdir -p $(DESTDIR)$(datadir)/doc/notecase/; \
+ 		mkdir -p $(DESTDIR)$(datadir)/applications/; \
+@@ -544,7 +556,6 @@
+ 		mkdir -p $(DESTDIR)$(datadir)/pixmaps/; \
  	fi;
- 	$(Q)if [ "$(ZAURUS)" = "" ]; then \
--		sed -i 's:[/]*#define _ZAURUS_BUILD.*://#define _ZAURUS_BUILD:' ./src/config.h; \
-+		sed -i.bak 's:[/]*#define _ZAURUS_BUILD.*://#define _ZAURUS_BUILD:' ./src/config.h; \
- 	else \
--		sed -i 's:[/]*#define _ZAURUS_BUILD.*:#define _ZAURUS_BUILD:' ./src/config.h; \
-+		sed -i.bak 's:[/]*#define _ZAURUS_BUILD.*:#define _ZAURUS_BUILD:' ./src/config.h; \
- 	fi;
--	$(Q)sed -i 's/^Version: .*/Version: $(VERSION)/' ./docs/control
--	$(Q)sed -i 's/^Version: .*/Version: $(VERSION)/' ./debian/control
--	$(Q)sed -i 's/^Architecture: .*/Architecture: $(ARCH)/' ./debian/control 
-+	$(Q)sed -i.bak 's/^Version: .*/Version: $(VERSION)/' ./docs/control
-+	$(Q)sed -i.bak 's/^Version: .*/Version: $(VERSION)/' ./debian/control
-+	$(Q)sed -i.bak 's/^Architecture: .*/Architecture: $(ARCH)/' ./debian/control 
- 
- #
- # - convert sources to DOS text format (this is multiplatform project)
-@@ -591,9 +599,9 @@
- #
- clean:
- 	@echo cleaning up
--	$(Q)cd ./src/lib/zlib/; make clean;
-+	$(Q)cd ./src/lib/zlib/; gmake clean;
- 	$(Q)rm -f $(OBJ)/*.o $(OBJ)/*.d $(OBJ)/*.a $(BIN)/core.* $(BIN)/notecase$(EXE) ./gmon.out
- 	$(Q)rm -rf ./notecase
- 
- 
--.PHONY : all help poinstall pouninstall install uninstall rpm pack packdos updatesrcdos updatesrc updatemime clean ipk deb weexpc check install2
-\ No newline at end of file
-+.PHONY : all help poinstall pouninstall install uninstall rpm pack packdos updatesrcdos updatesrc updatemime clean ipk deb weexpc check install2
+ 	$(INSTALL) -m 755 $(BIN)/notecase$(EXE) "$(DESTDIR)$(bindir)/notecase$(EXE)"
+-	$(INSTALL) -m 644 docs/help.ncd "$(DESTDIR)$(datadir)/doc/notecase/help.ncd"
+ 	$(INSTALL) -m 644 docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml"
+ 	$(Q)if [ -n "$(NOKIA_MAEMO_BUILD)" ]; then \
+ 		$(INSTALL) -m 644 docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/hildon/notecase.desktop"; \
diff --git a/deskutils/notecase/files/patch-src_gui_GuiLanguage.cpp b/deskutils/notecase/files/patch-src_gui_GuiLanguage.cpp
deleted file mode 100644
index a74f2b32331d..000000000000
--- a/deskutils/notecase/files/patch-src_gui_GuiLanguage.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/GuiLanguage.cpp.orig	Wed Jun  6 15:38:20 2007
-+++ src/gui/GuiLanguage.cpp	Thu Jul 19 17:19:33 2007
-@@ -13,6 +13,7 @@
- #include "GuiLanguage.h"
- #include <algorithm>
- #include <gtk/gtk.h>
-+#include <libgen.h>
- #ifdef ENABLE_NLS
- #include <libintl.h>
- #endif
diff --git a/deskutils/notecase/files/patch-src_lib_CircularBuffer.cpp b/deskutils/notecase/files/patch-src_lib_CircularBuffer.cpp
deleted file mode 100644
index 3ea8da6e95f7..000000000000
--- a/deskutils/notecase/files/patch-src_lib_CircularBuffer.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/CircularBuffer.cpp.orig	Tue Jul 10 16:23:18 2007
-+++ src/lib/CircularBuffer.cpp	Tue Jul 10 16:28:25 2007
-@@ -115,7 +115,7 @@
- 	struct timeval the_time;
- 	int result = gettimeofday(&the_time, NULL);
- 	if(result >= 0){
--		struct tm *pTime = localtime(&the_time.tv_sec);
-+		struct tm *pTime = localtime((time_t*)&the_time.tv_sec);
- 		sprintf(buffer, "%02d:%02d:%02d", pTime->tm_hour, pTime->tm_min, pTime->tm_sec);
- 
- 		//append miliseconds
diff --git a/deskutils/notecase/files/patch-src_main.cpp b/deskutils/notecase/files/patch-src_main.cpp
deleted file mode 100644
index 7257779308bc..000000000000
--- a/deskutils/notecase/files/patch-src_main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.cpp.orig	Thu Jul 19 16:58:40 2007
-+++ src/main.cpp	Thu Jul 19 16:58:55 2007
-@@ -11,6 +11,8 @@
- #include <gtk/gtk.h>
- #include <libintl.h>
- 
-+#include <libgen.h>
-+
- #include "interface.h"
- #include "callbacks.h"
- #include "support.h"
diff --git a/deskutils/notecase/pkg-plist b/deskutils/notecase/pkg-plist
index eda5d66c96d5..8e9c3921d6aa 100644
--- a/deskutils/notecase/pkg-plist
+++ b/deskutils/notecase/pkg-plist
@@ -1,7 +1,5 @@
 bin/notecase
 share/applications/notecase.desktop
-%%PORTDOCS%%%%DOCSDIR%%/help.ncd
-%%PORTDOCS%%%%DOCSDIR%%/license.txt
 share/locale/ar/LC_MESSAGES/notecase.mo
 share/locale/ca/LC_MESSAGES/notecase.mo
 share/locale/cs/LC_MESSAGES/notecase.mo
@@ -21,7 +19,6 @@ share/locale/ja/LC_MESSAGES/notecase.mo
 share/locale/ko/LC_MESSAGES/notecase.mo
 share/locale/ms/LC_MESSAGES/notecase.mo
 share/locale/nl/LC_MESSAGES/notecase.mo
-share/locale/nn/LC_MESSAGES/notecase.mo
 share/locale/no/LC_MESSAGES/notecase.mo
 share/locale/pl/LC_MESSAGES/notecase.mo
 share/locale/pt/LC_MESSAGES/notecase.mo
@@ -46,5 +43,4 @@ share/pixmaps/notecase.xpm
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications