Attachment #68633 for bug #100844

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




#

PORTNAME=	geany
PORTVERSION=	0.7.1
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

USE_X_PREFIX=	yes
USE_BZIP2=	yes
GNU_CONFIGURE=	yes
USE_GNOME=	gtk20
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"

OPTIONS=	VTE "With vte" ON

.include <bsd.port.pre.mk>

.if !defined(WITHOUT_NLS)
USE_GETTEXT=	yes
PLIST_SUB+=	NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+=	NLS="@comment "
.endif

.if defined(WITH_VTE)
USE_GNOME+=	vte
CONFIGURE_ARGS+=--enable-vte
.else
CONFIGURE_ARGS+=--disable-vte
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|gcc|${CC} ${CFLAGS}|' ${WRKSRC}/scintilla/Makefile.in
.if defined(NOPORTDOCS)

post-install:
	${INSTALL_DATA} ${WRKSRC}/geany.desktop ${PREFIX}/share/applications

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (geany-0.4.tar.bz2) = a1ed7e40762dd55763b28fe97fed9feb	1	MD5 (geany-0.7.1.tar.bz2) = bc6b93011b75b7a5256c164761141fb3
2	SHA256 (geany-0.4.tar.bz2) = 9ac508b80d9e3a698550146b882664d6068ccc20345df66048549275f3cf53b5	2	SHA256 (geany-0.7.1.tar.bz2) = 0d9004578f4da4bb1b6211c8ada892a409cb1b13ce558fd78803b0b63748a0c9
3	SIZE (geany-0.4.tar.bz2) = 993117	3	SIZE (geany-0.7.1.tar.bz2) = 1061842




bin/geany
%%PORTDOCS%%%%DOCSDIR%%/html/images/find_dialog.jpg
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit.jpg
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen.jpg
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_keys.jpg
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_templ.jpg
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_tools.jpg
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_vte.jpg
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
%%PORTDOCS%%%%DOCSDIR%%/html/geany.css
%%DATADIR%%/filetypes.java
%%DATADIR%%/filetypes.makefile
%%DATADIR%%/filetypes.markup
%%DATADIR%%/filetypes.pascal
%%DATADIR%%/filetypes.perl
%%DATADIR%%/filetypes.python
%%DATADIR%%/filetypes.sh
%%DATADIR%%/filetypes.tex
%%DATADIR%%/global.tags
%%PORTDOCS%%%%DOCSDIR%%/geany.txt
%%PORTDOCS%%%%DOCSDIR%%/html/apa.html
%%PORTDOCS%%%%DOCSDIR%%/html/apb.html
%%PORTDOCS%%%%DOCSDIR%%/html/apbs02.html
%%PORTDOCS%%%%DOCSDIR%%/html/apbs03.html
%%PORTDOCS%%%%DOCSDIR%%/html/apc.html
%%PORTDOCS%%%%DOCSDIR%%/html/ch01.html
%%PORTDOCS%%%%DOCSDIR%%/html/ch01s02.html
%%PORTDOCS%%%%DOCSDIR%%/html/ch01s03.html
%%PORTDOCS%%%%DOCSDIR%%/html/ch01s04.html
%%PORTDOCS%%%%DOCSDIR%%/html/ch02.html
%%PORTDOCS%%%%DOCSDIR%%/html/ch02s02.html
%%PORTDOCS%%%%DOCSDIR%%/html/ch02s03.html

%%PORTDOCS%%%%DOCSDIR%%/html/ch03s05.html
%%PORTDOCS%%%%DOCSDIR%%/html/ch03s06.html
%%PORTDOCS%%%%DOCSDIR%%/html/ch03s07.html
%%PORTDOCS%%%%DOCSDIR%%/html/ch03s08.html
%%PORTDOCS%%%%DOCSDIR%%/html/ch03s09.html
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit.jpg
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen.jpg
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_templ.jpg
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_tools.jpg
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_vte.jpg
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
@dirrmtry share/applications
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%%%DOCSDIR%%/manual.txt
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/ScintillaLicense.txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%NLS%%share/locale/de/LC_MESSAGES/geany.mo
%%NLS%%share/locale/es/LC_MESSAGES/geany.mo
%%NLS%%share/locale/ru/LC_MESSAGES/geany.mo
%%NLS%%share/locale/be/LC_MESSAGES/geany.mo
%%NLS%%share/locale/ca/LC_MESSAGES/geany.mo
%%NLS%%share/locale/pl/LC_MESSAGES/geany.mo
share/applications/geany.desktop
share/pixmaps/geany.png
@dirrmtry share/pixmaps
%%DATADIR%%/global.tags
%%DATADIR%%/GPL-2
%%DATADIR%%/filetypes.asm
%%DATADIR%%/filetypes.c
%%DATADIR%%/filetypes.caml
%%DATADIR%%/filetypes.common
%%DATADIR%%/filetypes.conf
%%DATADIR%%/filetypes.cpp
%%DATADIR%%/filetypes.css
%%DATADIR%%/filetypes.docbook
%%DATADIR%%/filetypes.java
%%DATADIR%%/filetypes.latex
%%DATADIR%%/filetypes.makefile
%%DATADIR%%/filetypes.oms
%%DATADIR%%/filetypes.pascal
%%DATADIR%%/filetypes.perl
%%DATADIR%%/filetypes.php
%%DATADIR%%/filetypes.python
%%DATADIR%%/filetypes.ruby
%%DATADIR%%/filetypes.sh
%%DATADIR%%/filetypes.sql
%%DATADIR%%/filetypes.tcl
%%DATADIR%%/filetypes.xml
@dirrmtry %%DATADIR%%

Removed Link Here

(-)files/patch-Makefile.in (-10 lines)
1	--- Makefile.in.orig Tue Apr 4 13:17:33 2006
2	+++ Makefile.in Tue Apr 4 13:17:41 2006
3	@@ -418,7 +418,6 @@
4	fi
5	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \
6	$(INSTALL_DATA) global.tags $(DESTDIR)$(pkgdatadir); \
7	- $(INSTALL_DATA) COPYING $(DESTDIR)$(pkgdatadir)/GPL-2; \
8	for file in $(srcdir)/data/*; do \
9	if test -f $$file; then \
10	$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/; \




--- src/callbacks.c.orig	Tue Apr  4 14:17:38 2006
+++ src/callbacks.c	Tue Apr  4 14:20:19 2006
@@ -151,7 +151,8 @@
 		gtk_widget_destroy(app->default_tag_tree);
 	}
 	gtk_widget_destroy(app->window);
-	if (app->have_vte) vte_close();
+	// this causes a crash, for some reason
+	// if (app->have_vte) vte_close();
 
 	g_free(app);
 




--- src/main.c.orig	Tue Apr  4 14:21:13 2006
+++ src/main.c	Tue Apr  4 14:21:16 2006
@@ -241,7 +241,10 @@
 	gtk_init(&argc, &argv);
 
 	// inits
-	app = g_new(MyApp, 1);
+	// use g_new0() to make sure that all members are initialized
+	// to NULL (otherwise it segfaults in destroyapp() when trying
+	// to g_free() some undefined pointers)
+	app = g_new0(MyApp, 1);
 #ifdef GEANY_DEBUG
 	geany_debug("debug mode built in (can't be disabled)");
 #endif

Return to bug 100844

Lines 6-12 Link Here

(-)Makefile (-3 / +22 lines)
6	#	6	#
7		7
8	PORTNAME= geany	8	PORTNAME= geany
9	PORTVERSION= 0.4	9	PORTVERSION= 0.7.1
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 17-25 Link Here
17	USE_X_PREFIX= yes	17	USE_X_PREFIX= yes
18	USE_BZIP2= yes	18	USE_BZIP2= yes
19	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
20	USE_GNOME= vte	20	USE_GNOME= gtk20
21	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"	21	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
22		22
		23	OPTIONS= VTE "With vte" ON
		24
		25	.include <bsd.port.pre.mk>
		26
		27	.if !defined(WITHOUT_NLS)
		28	USE_GETTEXT= yes
		29	PLIST_SUB+= NLS=""
		30	.else
		31	CONFIGURE_ARGS+=--disable-nls
		32	PLIST_SUB+= NLS="@comment "
		33	.endif
		34
		35	.if defined(WITH_VTE)
		36	USE_GNOME+= vte
		37	CONFIGURE_ARGS+=--enable-vte
		38	.else
		39	CONFIGURE_ARGS+=--disable-vte
		40	.endif
		41
23	post-patch:	42	post-patch:
24	@${REINPLACE_CMD} -e 's\|gcc\|${CC} ${CFLAGS}\|' ${WRKSRC}/scintilla/Makefile.in	43	@${REINPLACE_CMD} -e 's\|gcc\|${CC} ${CFLAGS}\|' ${WRKSRC}/scintilla/Makefile.in
25	.if defined(NOPORTDOCS)	44	.if defined(NOPORTDOCS)
Lines 29-32 Link Here
29	post-install:	48	post-install:
30	${INSTALL_DATA} ${WRKSRC}/geany.desktop ${PREFIX}/share/applications	49	${INSTALL_DATA} ${WRKSRC}/geany.desktop ${PREFIX}/share/applications
31		50
32	.include <bsd.port.mk>	51	.include <bsd.port.post.mk>

Lines 1-30 Link Here

(-)pkg-plist (-29 / +54 lines)
1	bin/geany	1	bin/geany
2	share/applications/geany.desktop	2	%%PORTDOCS%%%%DOCSDIR%%/html/images/find_dialog.jpg
3	share/locale/de/LC_MESSAGES/geany.mo	3	%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit.jpg
4	share/pixmaps/geany.png	4	%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen.jpg
5	%%DATADIR%%/filetypes.asm	5	%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_keys.jpg
6	%%DATADIR%%/filetypes.c	6	%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_templ.jpg
7	%%DATADIR%%/filetypes.common	7	%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_tools.jpg
8	%%DATADIR%%/filetypes.conf	8	%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_vte.jpg
9	%%DATADIR%%/filetypes.css	9	%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
10	%%DATADIR%%/filetypes.docbook	10	%%PORTDOCS%%%%DOCSDIR%%/html/geany.css
11	%%DATADIR%%/filetypes.java
12	%%DATADIR%%/filetypes.makefile
13	%%DATADIR%%/filetypes.markup
14	%%DATADIR%%/filetypes.pascal
15	%%DATADIR%%/filetypes.perl
16	%%DATADIR%%/filetypes.python
17	%%DATADIR%%/filetypes.sh
18	%%DATADIR%%/filetypes.tex
19	%%DATADIR%%/global.tags
20	%%PORTDOCS%%%%DOCSDIR%%/geany.txt
21	%%PORTDOCS%%%%DOCSDIR%%/html/apa.html	11	%%PORTDOCS%%%%DOCSDIR%%/html/apa.html
22	%%PORTDOCS%%%%DOCSDIR%%/html/apb.html	12	%%PORTDOCS%%%%DOCSDIR%%/html/apb.html
23	%%PORTDOCS%%%%DOCSDIR%%/html/apbs02.html	13	%%PORTDOCS%%%%DOCSDIR%%/html/apbs02.html
24	%%PORTDOCS%%%%DOCSDIR%%/html/apbs03.html	14	%%PORTDOCS%%%%DOCSDIR%%/html/apbs03.html
		15	%%PORTDOCS%%%%DOCSDIR%%/html/apc.html
25	%%PORTDOCS%%%%DOCSDIR%%/html/ch01.html	16	%%PORTDOCS%%%%DOCSDIR%%/html/ch01.html
26	%%PORTDOCS%%%%DOCSDIR%%/html/ch01s02.html	17	%%PORTDOCS%%%%DOCSDIR%%/html/ch01s02.html
27	%%PORTDOCS%%%%DOCSDIR%%/html/ch01s03.html	18	%%PORTDOCS%%%%DOCSDIR%%/html/ch01s03.html
		19	%%PORTDOCS%%%%DOCSDIR%%/html/ch01s04.html
28	%%PORTDOCS%%%%DOCSDIR%%/html/ch02.html	20	%%PORTDOCS%%%%DOCSDIR%%/html/ch02.html
29	%%PORTDOCS%%%%DOCSDIR%%/html/ch02s02.html	21	%%PORTDOCS%%%%DOCSDIR%%/html/ch02s02.html
30	%%PORTDOCS%%%%DOCSDIR%%/html/ch02s03.html	22	%%PORTDOCS%%%%DOCSDIR%%/html/ch02s03.html
Lines 35-50 Link Here
35	%%PORTDOCS%%%%DOCSDIR%%/html/ch03s05.html	27	%%PORTDOCS%%%%DOCSDIR%%/html/ch03s05.html
36	%%PORTDOCS%%%%DOCSDIR%%/html/ch03s06.html	28	%%PORTDOCS%%%%DOCSDIR%%/html/ch03s06.html
37	%%PORTDOCS%%%%DOCSDIR%%/html/ch03s07.html	29	%%PORTDOCS%%%%DOCSDIR%%/html/ch03s07.html
38	%%PORTDOCS%%%%DOCSDIR%%/html/geany.css	30	%%PORTDOCS%%%%DOCSDIR%%/html/ch03s08.html
39	%%PORTDOCS%%%%DOCSDIR%%/html/images/find_dialog.jpg	31	%%PORTDOCS%%%%DOCSDIR%%/html/ch03s09.html
40	%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit.jpg
41	%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen.jpg
42	%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_templ.jpg
43	%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_tools.jpg
44	%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_vte.jpg
45	%%PORTDOCS%%%%DOCSDIR%%/html/index.html	32	%%PORTDOCS%%%%DOCSDIR%%/html/index.html
46	@dirrmtry share/applications
47	@dirrm %%DATADIR%%
48	%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
49	%%PORTDOCS%%@dirrm %%DOCSDIR%%/html	33	%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
		34	%%PORTDOCS%%%%DOCSDIR%%/manual.txt
		35	%%PORTDOCS%%%%DOCSDIR%%/README
		36	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
		37	%%PORTDOCS%%%%DOCSDIR%%/NEWS
		38	%%PORTDOCS%%%%DOCSDIR%%/COPYING
		39	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
		40	%%PORTDOCS%%%%DOCSDIR%%/TODO
		41	%%PORTDOCS%%%%DOCSDIR%%/ScintillaLicense.txt
50	%%PORTDOCS%%@dirrm %%DOCSDIR%%	42	%%PORTDOCS%%@dirrm %%DOCSDIR%%
		43	%%NLS%%share/locale/de/LC_MESSAGES/geany.mo
		44	%%NLS%%share/locale/es/LC_MESSAGES/geany.mo
		45	%%NLS%%share/locale/ru/LC_MESSAGES/geany.mo
		46	%%NLS%%share/locale/be/LC_MESSAGES/geany.mo
		47	%%NLS%%share/locale/ca/LC_MESSAGES/geany.mo
		48	%%NLS%%share/locale/pl/LC_MESSAGES/geany.mo
		49	share/applications/geany.desktop
		50	share/pixmaps/geany.png
		51	@dirrmtry share/pixmaps
		52	%%DATADIR%%/global.tags
		53	%%DATADIR%%/GPL-2
		54	%%DATADIR%%/filetypes.asm
		55	%%DATADIR%%/filetypes.c
		56	%%DATADIR%%/filetypes.caml
		57	%%DATADIR%%/filetypes.common
		58	%%DATADIR%%/filetypes.conf
		59	%%DATADIR%%/filetypes.cpp
		60	%%DATADIR%%/filetypes.css
		61	%%DATADIR%%/filetypes.docbook
		62	%%DATADIR%%/filetypes.java
		63	%%DATADIR%%/filetypes.latex
		64	%%DATADIR%%/filetypes.makefile
		65	%%DATADIR%%/filetypes.oms
		66	%%DATADIR%%/filetypes.pascal
		67	%%DATADIR%%/filetypes.perl
		68	%%DATADIR%%/filetypes.php
		69	%%DATADIR%%/filetypes.python
		70	%%DATADIR%%/filetypes.ruby
		71	%%DATADIR%%/filetypes.sh
		72	%%DATADIR%%/filetypes.sql
		73	%%DATADIR%%/filetypes.tcl
		74	%%DATADIR%%/filetypes.xml
		75	@dirrmtry %%DATADIR%%

Removed Link Here

(-)files/patch-src_callbacks.c (-12 lines)
1	--- src/callbacks.c.orig Tue Apr 4 14:17:38 2006
2	+++ src/callbacks.c Tue Apr 4 14:20:19 2006
3	@@ -151,7 +151,8 @@
4	gtk_widget_destroy(app->default_tag_tree);
5	}
6	gtk_widget_destroy(app->window);
7	- if (app->have_vte) vte_close();
8	+ // this causes a crash, for some reason
9	+ // if (app->have_vte) vte_close();
10
11	g_free(app);
12

Removed Link Here

(-)files/patch-src_main.c (-14 lines)
1	--- src/main.c.orig Tue Apr 4 14:21:13 2006
2	+++ src/main.c Tue Apr 4 14:21:16 2006
3	@@ -241,7 +241,10 @@
4	gtk_init(&argc, &argv);
5
6	// inits
7	- app = g_new(MyApp, 1);
8	+ // use g_new0() to make sure that all members are initialized
9	+ // to NULL (otherwise it segfaults in destroyapp() when trying
10	+ // to g_free() some undefined pointers)
11	+ app = g_new0(MyApp, 1);
12	#ifdef GEANY_DEBUG
13	geany_debug("debug mode built in (can't be disabled)");
14	#endif