View | Details | Raw Unified | Return to bug 121920
Collapse All | Expand All

(-)notecase/Makefile (-3 / +7 lines)
Lines 6-17 Link Here
6
#
6
#
7
7
8
PORTNAME=	notecase
8
PORTNAME=	notecase
9
PORTVERSION=	1.5.8
9
PORTVERSION=	1.8.1
10
CATEGORIES=	deskutils textproc
10
CATEGORIES=	deskutils textproc
11
MASTER_SITES=	SF
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	notecase
12
DISTNAME=	${PORTNAME}-${PORTVERSION}_src
13
DISTNAME=	${PORTNAME}-${PORTVERSION}_src
13
14
14
MAINTAINER=	ports@FreeBSD.org
15
MAINTAINER=	ganael.laplanche@martymac.com
15
COMMENT=	A hierarchical text notes manager
16
COMMENT=	A hierarchical text notes manager
16
17
17
USE_GMAKE=	yes
18
USE_GMAKE=	yes
Lines 21-26 Link Here
21
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
22
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
22
23
23
.if !defined(NOPORTDOCS)
24
.if !defined(NOPORTDOCS)
25
PORTDOCS=	help.ncd license.txt
24
INSTALL_TARGET=	install docinstall
26
INSTALL_TARGET=	install docinstall
25
.endif
27
.endif
26
28
Lines 33-38 Link Here
33
post-patch:
35
post-patch:
34
	@${REINPLACE_CMD} -e 's|prefix=/usr|prefix=${PREFIX}|' \
36
	@${REINPLACE_CMD} -e 's|prefix=/usr|prefix=${PREFIX}|' \
35
		${WRKSRC}/Makefile
37
		${WRKSRC}/Makefile
38
	@${REINPLACE_CMD} -e 's|docsdir=|docsdir=${DOCSDIR}|' \
39
		${WRKSRC}/Makefile
36
40
37
post-install:
41
post-install:
38
	@-update-mime-database ${PREFIX}/share/mime
42
	@-update-mime-database ${PREFIX}/share/mime
(-)notecase/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (notecase-1.5.8_src.tar.gz) = 6e44c5e7bff2afdec36f63963fe18b20
1
MD5 (notecase-1.8.1_src.tar.gz) = 303f56e1929d069f805ef87abbff363e
2
SHA256 (notecase-1.5.8_src.tar.gz) = b27ac143df957483fba88c98885551657377f173fb588ac1be395ffb0c92683f
2
SHA256 (notecase-1.8.1_src.tar.gz) = 94f434f6e8c68136978fde763d375dd33e60676cc9d5737192b867318069c2f7
3
SIZE (notecase-1.5.8_src.tar.gz) = 667078
3
SIZE (notecase-1.8.1_src.tar.gz) = 883359
(-)notecase/files/patch-Makefile (-91 / +57 lines)
Lines 1-109 Link Here
1
--- Makefile.orig	Mon Jun 25 12:53:44 2007
1
--- Makefile.orig	2008-02-27 10:24:44.000000000 +0100
2
+++ Makefile	Thu Jul 19 18:41:38 2007
2
+++ Makefile	2008-03-20 17:06:20.445074259 +0100
3
@@ -80,7 +79,7 @@
3
@@ -13,6 +13,7 @@
4
 prefix=/usr
5
 bindir=$(prefix)/bin
6
 datadir=$(prefix)/share
7
+docsdir=
8
 
9
 # define top of RPM build area
10
 topdir=/usr/src/redhat
11
@@ -129,12 +130,18 @@
12
 ifdef OSX_BUILD
13
  INSTALL=install -c
14
 endif 
15
+ifdef FREEBSD_BUILD
16
+ INSTALL=install
17
+endif 
18
 
19
 #define proper sed (use gnused for Darwin?)
20
 SED=sed -i
21
 ifneq ($(OSX_BUILD),)
22
 	SED=sed -i.bak
23
 endif
24
+ifneq ($(FREEBSD_BUILD),)
25
+	SED=sed -i.bak
26
+endif
27
 
28
 MD5SUM=md5sum
29
 ifneq ($(OSX_BUILD),)
30
@@ -164,7 +171,7 @@
4
 ifdef WINDIR
31
 ifdef WINDIR
5
  LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -L$(OBJ) -lz 
32
  LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -L$(OBJ) -lz 
6
 else
33
 else
7
- LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -ldl -export-dynamic $(LOPTIMIZE)
34
- LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -ldl
8
+ LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -export-dynamic $(LOPTIMIZE)
35
+ LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS)
9
 endif 
36
 endif
10
 
11
 #
12
@@ -360,7 +359,7 @@
13
 	$(CC) $(FLAGS) -c $(GUIPATH)/DocActionFinishDel.cpp -o $(OBJ)/DocActionFinishDel.o $(GTKCFLAGS)
14
 	
15
 $(OBJ)/libz.a:
16
-	@cd ./src/lib/zlib/; make; cp ./libz.a ../../../$(OBJ)/
17
+	@cd ./src/lib/zlib/; gmake; cp ./libz.a ../../../$(OBJ)/
18
 
37
 
19
 $(OBJ)/ShortcutsList.o: $(GUIPATH)/ShortcutsList.cpp $(GUIPATH)/ShortcutsList.h
38
 ifndef OSX_BUILD 
20
 	$(CC) $(FLAGS) -c $(GUIPATH)/ShortcutsList.cpp -o $(OBJ)/ShortcutsList.o  $(GTKCFLAGS)
39
@@ -520,7 +527,7 @@
21
@@ -405,7 +404,8 @@
22
 		rm -f po/messages.mo; \
40
 		rm -f po/messages.mo; \
23
 		msgfmt $$i -o po/messages.mo; \
41
 		msgfmt $$i -o po/messages.mo; \
24
 		echo "Installing: $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo";\
42
 		echo "Installing: $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo";\
25
-		install -D -m 644 po/messages.mo "$(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo"; \
43
-		if [ "$(OSX_BUILD)" = "1" ]; then \
26
+		install -d $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES; \
44
+		if [ "$(OSX_BUILD)" = "1" ] || [ "$(FREEBSD_BUILD)" = "1" ]; then \
27
+		install -m 644 -c po/messages.mo "$(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo"; \
45
 			mkdir -p $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/; \
28
 	done; \
46
 		fi; \
29
 	rm -f po/messages.mo; 
47
 		$(INSTALL) -m 644 po/messages.mo "$(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo"; \
30
 	@echo done installing translations
48
@@ -531,12 +538,17 @@
31
@@ -413,16 +413,24 @@
32
 pouninstall:
49
 pouninstall:
33
 	@rm -vf $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/notecase.mo
50
 	@rm -vf $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/notecase.mo
34
 	@echo done uninstalling translations
51
 	@echo done uninstalling translations
35
-	
52
-	
36
+
53
+
37
+docinstall:
54
+docinstall:
38
+	-install -d $(DESTDIR)$(datadir)/doc/notecase
55
+	mkdir -p $(docsdir)
39
+	install -m 644 -c docs/help.ncd "$(DESTDIR)$(datadir)/doc/notecase/help.ncd"
56
+	$(INSTALL) -m 644 -c docs/help.ncd "$(docsdir)/help.ncd"
40
+	install -m 644 -c docs/license.txt "$(DESTDIR)$(datadir)/doc/notecase/license.txt"
57
+	$(INSTALL) -m 644 -c docs/license.txt "$(docsdir)/license.txt"
41
+
58
+
42
 #
59
 #
43
 # install application
60
 # install application
44
 #
61
 #
45
 install: notecase$(EXE) poinstall
62
 install: notecase$(EXE) poinstall
46
-	install -D -m 755 $(BIN)/notecase "$(DESTDIR)$(bindir)/notecase"
63
-	$(Q)if [ "$(OSX_BUILD)" = "1" ]; then \
47
-	install -D -m 644 docs/help.ncd "$(DESTDIR)$(datadir)/doc/notecase/help.ncd"
64
+	$(Q)if [ "$(OSX_BUILD)" = "1" ] || [ "$(FREEBSD_BUILD)" = "1" ]; then \
48
-	install -D -m 644 docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/notecase.desktop"
65
 		mkdir -p $(DESTDIR)$(bindir); \
49
-	install -D -m 644 docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml"
66
 		mkdir -p $(DESTDIR)$(datadir)/doc/notecase/; \
50
-	install -D -m 644 res/notecase.xpm "$(DESTDIR)$(datadir)/pixmaps/notecase.xpm"
67
 		mkdir -p $(DESTDIR)$(datadir)/applications/; \
51
+	-install -d $(DESTDIR)$(bindir)
68
@@ -544,7 +556,6 @@
52
+	install -m 755 -c $(BIN)/notecase "$(DESTDIR)$(bindir)/notecase"
69
 		mkdir -p $(DESTDIR)$(datadir)/pixmaps/; \
53
+	-install -d $(DESTDIR)$(datadir)/applications
54
+	install -m 644 -c docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/notecase.desktop"
55
+	-install -d $(DESTDIR)$(datadir)/mime/packages
56
+	install -m 644 -c docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml"
57
+	-install -d $(DESTDIR)$(datadir)/pixmaps
58
+	install -m 644 -c res/notecase.xpm "$(DESTDIR)$(datadir)/pixmaps/notecase.xpm"
59
 	@echo done installing
60
 
61
 #
62
@@ -474,23 +482,23 @@
63
 #   7. update version in the control file used to build Debian/Ubuntu .deb package
64
 #
65
 updatesrc:
66
-	$(Q)sed -i 's/^Version:.*/Version:        $(VERSION)/' ./docs/notecase.spec
67
-	$(Q)sed -i 's/^Source:.*/Source:         $(archive).tar.gz/' ./docs/notecase.spec
68
-	$(Q)sed -i 's/\#define APP_VER_STR .*/\#define APP_VER_STR "$(VERSION)"/' ./src/config.h
69
-	$(Q)sed -i 's:\#define INSTALL_PREFIX .*:\#define INSTALL_PREFIX "$(DESTDIR)$(prefix)":' ./src/config.h
70
+	$(Q)sed -i.bak 's/^Version:.*/Version:        $(VERSION)/' ./docs/notecase.spec
71
+	$(Q)sed -i.bak 's/^Source:.*/Source:         $(archive).tar.gz/' ./docs/notecase.spec
72
+	$(Q)sed -i.bak 's/\#define APP_VER_STR .*/\#define APP_VER_STR "$(VERSION)"/' ./src/config.h
73
+	$(Q)sed -i.bak 's:\#define INSTALL_PREFIX .*:\#define INSTALL_PREFIX "$(DESTDIR)$(prefix)":' ./src/config.h
74
 	$(Q)if [ "$(HAVE_GNOME_VFS)" = "" ]; then \
75
-		sed -i 's:[/]*#define HAVE_GNOME_VFS.*://#define HAVE_GNOME_VFS:' ./src/config.h; \
76
+		sed -i.bak 's:[/]*#define HAVE_GNOME_VFS.*://#define HAVE_GNOME_VFS:' ./src/config.h; \
77
 	else \
78
-		sed -i 's:[/]*#define HAVE_GNOME_VFS.*:#define HAVE_GNOME_VFS:' ./src/config.h; \
79
+		sed -i.bak 's:[/]*#define HAVE_GNOME_VFS.*:#define HAVE_GNOME_VFS:' ./src/config.h; \
80
 	fi;
70
 	fi;
81
 	$(Q)if [ "$(ZAURUS)" = "" ]; then \
71
 	$(INSTALL) -m 755 $(BIN)/notecase$(EXE) "$(DESTDIR)$(bindir)/notecase$(EXE)"
82
-		sed -i 's:[/]*#define _ZAURUS_BUILD.*://#define _ZAURUS_BUILD:' ./src/config.h; \
72
-	$(INSTALL) -m 644 docs/help.ncd "$(DESTDIR)$(datadir)/doc/notecase/help.ncd"
83
+		sed -i.bak 's:[/]*#define _ZAURUS_BUILD.*://#define _ZAURUS_BUILD:' ./src/config.h; \
73
 	$(INSTALL) -m 644 docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml"
84
 	else \
74
 	$(Q)if [ -n "$(NOKIA_MAEMO_BUILD)" ]; then \
85
-		sed -i 's:[/]*#define _ZAURUS_BUILD.*:#define _ZAURUS_BUILD:' ./src/config.h; \
75
 		$(INSTALL) -m 644 docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/hildon/notecase.desktop"; \
86
+		sed -i.bak 's:[/]*#define _ZAURUS_BUILD.*:#define _ZAURUS_BUILD:' ./src/config.h; \
87
 	fi;
88
-	$(Q)sed -i 's/^Version: .*/Version: $(VERSION)/' ./docs/control
89
-	$(Q)sed -i 's/^Version: .*/Version: $(VERSION)/' ./debian/control
90
-	$(Q)sed -i 's/^Architecture: .*/Architecture: $(ARCH)/' ./debian/control 
91
+	$(Q)sed -i.bak 's/^Version: .*/Version: $(VERSION)/' ./docs/control
92
+	$(Q)sed -i.bak 's/^Version: .*/Version: $(VERSION)/' ./debian/control
93
+	$(Q)sed -i.bak 's/^Architecture: .*/Architecture: $(ARCH)/' ./debian/control 
94
 
95
 #
96
 # - convert sources to DOS text format (this is multiplatform project)
97
@@ -591,9 +599,9 @@
98
 #
99
 clean:
100
 	@echo cleaning up
101
-	$(Q)cd ./src/lib/zlib/; make clean;
102
+	$(Q)cd ./src/lib/zlib/; gmake clean;
103
 	$(Q)rm -f $(OBJ)/*.o $(OBJ)/*.d $(OBJ)/*.a $(BIN)/core.* $(BIN)/notecase$(EXE) ./gmon.out
104
 	$(Q)rm -rf ./notecase
105
 
106
 
107
-.PHONY : all help poinstall pouninstall install uninstall rpm pack packdos updatesrcdos updatesrc updatemime clean ipk deb weexpc check install2
108
\ No newline at end of file
109
+.PHONY : all help poinstall pouninstall install uninstall rpm pack packdos updatesrcdos updatesrc updatemime clean ipk deb weexpc check install2
(-)notecase/files/patch-po-it (+11 lines)
Line 0 Link Here
1
--- po/it.po.orig	2008-03-20 16:38:02.547478894 +0100
2
+++ po/it.po	2008-03-20 16:38:43.242373357 +0100
3
@@ -412,7 +412,7 @@
4
 #: callbacks.cpp:5919
5
 #: FileAttachmentDlg.cpp:592
6
 msgid "Failed to open input file!\n"
7
-msgstr "Errore nell'apertura del file di input!"
8
+msgstr "Errore nell'apertura del file di input!\n"
9
 
10
 #: callbacks.cpp:5933
11
 #: FileAttachmentDlg.cpp:292
(-)notecase/files/patch-src_gui_GuiLanguage.cpp (-10 lines)
Lines 1-10 Link Here
1
--- src/gui/GuiLanguage.cpp.orig	Wed Jun  6 15:38:20 2007
2
+++ src/gui/GuiLanguage.cpp	Thu Jul 19 17:19:33 2007
3
@@ -13,6 +13,7 @@
4
 #include "GuiLanguage.h"
5
 #include <algorithm>
6
 #include <gtk/gtk.h>
7
+#include <libgen.h>
8
 #ifdef ENABLE_NLS
9
 #include <libintl.h>
10
 #endif
(-)notecase/files/patch-src_lib_CircularBuffer.cpp (-11 lines)
Lines 1-11 Link Here
1
--- src/lib/CircularBuffer.cpp.orig	Tue Jul 10 16:23:18 2007
2
+++ src/lib/CircularBuffer.cpp	Tue Jul 10 16:28:25 2007
3
@@ -115,7 +115,7 @@
4
 	struct timeval the_time;
5
 	int result = gettimeofday(&the_time, NULL);
6
 	if(result >= 0){
7
-		struct tm *pTime = localtime(&the_time.tv_sec);
8
+		struct tm *pTime = localtime((time_t*)&the_time.tv_sec);
9
 		sprintf(buffer, "%02d:%02d:%02d", pTime->tm_hour, pTime->tm_min, pTime->tm_sec);
10
 
11
 		//append miliseconds
(-)notecase/files/patch-src_main.cpp (-11 lines)
Lines 1-11 Link Here
1
--- src/main.cpp.orig	Thu Jul 19 16:58:40 2007
2
+++ src/main.cpp	Thu Jul 19 16:58:55 2007
3
@@ -11,6 +11,8 @@
4
 #include <gtk/gtk.h>
5
 #include <libintl.h>
6
 
7
+#include <libgen.h>
8
+
9
 #include "interface.h"
10
 #include "callbacks.h"
11
 #include "support.h"
(-)notecase/pkg-plist (-4 lines)
Lines 1-7 Link Here
1
bin/notecase
1
bin/notecase
2
share/applications/notecase.desktop
2
share/applications/notecase.desktop
3
%%PORTDOCS%%%%DOCSDIR%%/help.ncd
4
%%PORTDOCS%%%%DOCSDIR%%/license.txt
5
share/locale/ar/LC_MESSAGES/notecase.mo
3
share/locale/ar/LC_MESSAGES/notecase.mo
6
share/locale/ca/LC_MESSAGES/notecase.mo
4
share/locale/ca/LC_MESSAGES/notecase.mo
7
share/locale/cs/LC_MESSAGES/notecase.mo
5
share/locale/cs/LC_MESSAGES/notecase.mo
Lines 21-27 Link Here
21
share/locale/ko/LC_MESSAGES/notecase.mo
19
share/locale/ko/LC_MESSAGES/notecase.mo
22
share/locale/ms/LC_MESSAGES/notecase.mo
20
share/locale/ms/LC_MESSAGES/notecase.mo
23
share/locale/nl/LC_MESSAGES/notecase.mo
21
share/locale/nl/LC_MESSAGES/notecase.mo
24
share/locale/nn/LC_MESSAGES/notecase.mo
25
share/locale/no/LC_MESSAGES/notecase.mo
22
share/locale/no/LC_MESSAGES/notecase.mo
26
share/locale/pl/LC_MESSAGES/notecase.mo
23
share/locale/pl/LC_MESSAGES/notecase.mo
27
share/locale/pt/LC_MESSAGES/notecase.mo
24
share/locale/pt/LC_MESSAGES/notecase.mo
Lines 46-50 Link Here
46
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
43
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
47
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
44
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
48
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
45
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
49
%%PORTDOCS%%@dirrm %%DOCSDIR%%
50
@dirrmtry share/applications
46
@dirrmtry share/applications

Return to bug 121920