Attachment #92030 for bug #129593

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




#

PORTNAME=	notecase
PORTVERSION=	1.9.8
CATEGORIES=	deskutils textproc
MASTER_SITES=	SF
DISTNAME=	${PORTNAME}-${PORTVERSION}_src

COMMENT=	A hierarchical text notes manager

USE_GMAKE=	yes
USE_GNOME=	gtk20 gtksourceview2 gnomevfs2 desktopfileutils pkgconfig
USE_GETTEXT=	yes

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

.endif

post-patch:
	@${REINPLACE_CMD} -e 's|^prefix=.*|prefix=${PREFIX}|' \
		${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e 's|^docsdir=.*|docsdir=${DOCSDIR}|' \
		${WRKSRC}/Makefile

post-install:

Lines 1-3 Link Here

(-)notecase/distinfo (-3 / +3 lines)
1	MD5 (notecase-1.9.7_src.tar.gz) = e4f18591e87a9d119b1ff4f503ba6d20	1	MD5 (notecase-1.9.8_src.tar.gz) = 9fe7d2db959d4c457d53313bb8faac35
2	SHA256 (notecase-1.9.7_src.tar.gz) = 1993bb71a36f8e0b20bf78f25d826a3ea1dc0a007d3c6981890462dd91c42ae5	2	SHA256 (notecase-1.9.8_src.tar.gz) = 0b7e23ec97efd5cd4ada651ac93273f9e5ed2cfff027abfb4ae130039563b746
3	SIZE (notecase-1.9.7_src.tar.gz) = 930981	3	SIZE (notecase-1.9.8_src.tar.gz) = 928579




--- Makefile.orig	2008-12-09 11:07:06.000000000 +0100
+++ Makefile	2008-12-12 09:15:50.220188108 +0100
@@ -10,9 +10,10 @@
 VERSION=1.9.8
 
 # define install target dirs
-prefix=/usr
+prefix=/usr/local
 bindir=$(prefix)/bin
 datadir=$(prefix)/share
+docsdir=/usr/local/share/doc/notecase
 
 # define top of RPM build area
 topdir=/usr/src/redhat
@@ -601,18 +602,21 @@
 pouninstall:
 	@rm -vf $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/notecase.mo
 	@echo done uninstalling translations

 #
 # install application
 #
 install: $(BIN)/notecase$(EXE) poinstall
 	install -d -m 755 $(DESTDIR)$(bindir)
-	install -d -m 755 $(DESTDIR)$(datadir)/doc/notecase/
 	install -d -m 755 $(DESTDIR)$(datadir)/applications/

 	$(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"; \
@@ -694,12 +698,6 @@
 		echo 'pkg-config error detected $(shell pkg-config --cflags $(LIBS))';\
 		exit 1;\
 	fi;  
-	$(Q)if [ "$(HAVE_GTKSOURCEVIEW)" = "1" ]; then \
-		if [[ "$(TEST_SRCVIEW_VER)" < "2.4.1" ]]; then \
-		echo 'ERROR: gtksourceview package is too old ($(shell pkg-config --modversion gtksourceview-2.0))!';\
-		exit 1;\
-		fi;\
-	fi;
 	$(Q)echo 'Configuration: GNOME_VFS=$(HAVE_GNOME_VFS);GTKSOURCEVIEW=$(HAVE_GTKSOURCEVIEW);DEBUG=$(DEBUG);PROFILE=$(PROFILE);BYTE_ORDER=$(BYTE_ORDER);PLATFORM=$(PLATFORM)' 
 	$(Q)$(SED) 's/^Version:.*/Version:        $(VERSION)/' ./docs/notecase.spec
 	$(Q)$(SED) 's/^Source:.*/Source:         $(archive)_src.tar.gz/' ./docs/notecase.spec
@@ -820,7 +818,7 @@
 #
 # Note: first "make" command forces generating correct help file path in "config.h"
 #

Return to bug 129593

Lines 6-12 Link Here

(-)notecase/Makefile (-4 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= notecase	8	PORTNAME= notecase
9	PORTVERSION= 1.9.7	9	PORTVERSION= 1.9.8
10	CATEGORIES= deskutils textproc	10	CATEGORIES= deskutils textproc
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12	DISTNAME= ${PORTNAME}-${PORTVERSION}_src	12	DISTNAME= ${PORTNAME}-${PORTVERSION}_src
Lines 15-21 Link Here
15	COMMENT= A hierarchical text notes manager	15	COMMENT= A hierarchical text notes manager
16		16
17	USE_GMAKE= yes	17	USE_GMAKE= yes
18	USE_GNOME= gtk20 gnomevfs2 desktopfileutils pkgconfig	18	USE_GNOME= gtk20 gtksourceview2 gnomevfs2 desktopfileutils pkgconfig
19	USE_GETTEXT= yes	19	USE_GETTEXT= yes
20		20
21	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	21	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Lines 26-34 Link Here
26	.endif	26	.endif
27		27
28	post-patch:	28	post-patch:
29	@${REINPLACE_CMD} -e 's\|prefix=/usr\|prefix=${PREFIX}\|' \	29	@${REINPLACE_CMD} -e 's\|^prefix=.*\|prefix=${PREFIX}\|' \
30	${WRKSRC}/Makefile	30	${WRKSRC}/Makefile
31	@${REINPLACE_CMD} -e 's\|docsdir=\|docsdir=${DOCSDIR}\|' \	31	@${REINPLACE_CMD} -e 's\|^docsdir=.*\|docsdir=${DOCSDIR}\|' \
32	${WRKSRC}/Makefile	32	${WRKSRC}/Makefile
33		33
34	post-install:	34	post-install:

Lines 1-14 Link Here

(-)notecase/files/patch-Makefile (-8 / +25 lines)
1	--- Makefile.orig 2008-10-28 13:39:40.000000000 +0100	1	--- Makefile.orig 2008-12-09 11:07:06.000000000 +0100
2	+++ Makefile 2008-11-04 15:51:07.000000000 +0100	2	+++ Makefile 2008-12-12 09:15:50.220188108 +0100
3	@@ -13,6 +13,7 @@	3	@@ -10,9 +10,10 @@
4	prefix=/usr	4	VERSION=1.9.8
		5
		6	# define install target dirs
		7	-prefix=/usr
		8	+prefix=/usr/local
5	bindir=$(prefix)/bin	9	bindir=$(prefix)/bin
6	datadir=$(prefix)/share	10	datadir=$(prefix)/share
7	+docsdir=	11	+docsdir=/usr/local/share/doc/notecase
8		12
9	# define top of RPM build area	13	# define top of RPM build area
10	topdir=/usr/src/redhat	14	topdir=/usr/src/redhat
11	@@ -592,18 +593,21 @@	15	@@ -601,18 +602,21 @@
12	pouninstall:	16	pouninstall:
13	@rm -vf $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/notecase.mo	17	@rm -vf $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/notecase.mo
14	@echo done uninstalling translations	18	@echo done uninstalling translations
Lines 22-28 Link Here
22	#	26	#
23	# install application	27	# install application
24	#	28	#
25	install: notecase$(EXE) poinstall	29	install: $(BIN)/notecase$(EXE) poinstall
26	install -d -m 755 $(DESTDIR)$(bindir)	30	install -d -m 755 $(DESTDIR)$(bindir)
27	- install -d -m 755 $(DESTDIR)$(datadir)/doc/notecase/	31	- install -d -m 755 $(DESTDIR)$(datadir)/doc/notecase/
28	install -d -m 755 $(DESTDIR)$(datadir)/applications/	32	install -d -m 755 $(DESTDIR)$(datadir)/applications/
Lines 33-39 Link Here
33	$(INSTALL) -m 644 docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml"	37	$(INSTALL) -m 644 docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml"
34	$(Q)if [ -n "$(NOKIA_MAEMO_BUILD)" ]; then \	38	$(Q)if [ -n "$(NOKIA_MAEMO_BUILD)" ]; then \
35	$(INSTALL) -m 644 docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/hildon/notecase.desktop"; \	39	$(INSTALL) -m 644 docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/hildon/notecase.desktop"; \
36	@@ -800,7 +804,7 @@	40	@@ -694,12 +698,6 @@
		41	echo 'pkg-config error detected $(shell pkg-config --cflags $(LIBS))';\
		42	exit 1;\
		43	fi;
		44	- $(Q)if [ "$(HAVE_GTKSOURCEVIEW)" = "1" ]; then \
		45	- if [[ "$(TEST_SRCVIEW_VER)" < "2.4.1" ]]; then \
		46	- echo 'ERROR: gtksourceview package is too old ($(shell pkg-config --modversion gtksourceview-2.0))!';\
		47	- exit 1;\
		48	- fi;\
		49	- fi;
		50	$(Q)echo 'Configuration: GNOME_VFS=$(HAVE_GNOME_VFS);GTKSOURCEVIEW=$(HAVE_GTKSOURCEVIEW);DEBUG=$(DEBUG);PROFILE=$(PROFILE);BYTE_ORDER=$(BYTE_ORDER);PLATFORM=$(PLATFORM)'
		51	$(Q)$(SED) 's/^Version:.*/Version: $(VERSION)/' ./docs/notecase.spec
		52	$(Q)$(SED) 's/^Source:.*/Source: $(archive)_src.tar.gz/' ./docs/notecase.spec
		53	@@ -820,7 +818,7 @@
37	#	54	#
38	# Note: first "make" command forces generating correct help file path in "config.h"	55	# Note: first "make" command forces generating correct help file path in "config.h"
39	#	56	#