diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2003-12-18 12:07:42 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2003-12-18 12:07:42 +0000 |
| commit | 2f6e94fd243ec8303181edebd1e355282bdac5b2 (patch) | |
| tree | 3659c26f6ccca218a917248074b26839aa48353e /editors | |
| parent | 7a33d31ddd4947b59e890e77059242cdf4e8d31e (diff) | |
| download | ports-2f6e94fd243ec8303181edebd1e355282bdac5b2.tar.gz ports-2f6e94fd243ec8303181edebd1e355282bdac5b2.zip | |
- Update to 0.7.8
Notes
Notes:
svn path=/head/; revision=96140
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/conglomerate/Makefile | 6 | ||||
| -rw-r--r-- | editors/conglomerate/distinfo | 2 | ||||
| -rw-r--r-- | editors/conglomerate/files/patch-intltool-merge.in | 11 | ||||
| -rw-r--r-- | editors/conglomerate/files/patch-src-cong-primary-window.c | 19 |
4 files changed, 17 insertions, 21 deletions
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile index f4efb8a4c639..6dc19cafed64 100644 --- a/editors/conglomerate/Makefile +++ b/editors/conglomerate/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= conglomerate -PORTVERSION= 0.7.7 +PORTVERSION= 0.7.8 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,7 +17,11 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= libgnomeui gtksourceview gnomeprefix gnomehack USE_LIBTOOL= yes +USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +post-patch: + @${REINPLACE_CMD} -e 's|/home/david/jhbuilt/share|${LOCALBASE}/share|' ${WRKSRC}/intltool-merge.in + .include <bsd.port.mk> diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo index 6a308d2a675f..13f4014e92c7 100644 --- a/editors/conglomerate/distinfo +++ b/editors/conglomerate/distinfo @@ -1 +1 @@ -MD5 (conglomerate-0.7.7.tar.gz) = f63dbd271dfe7605683fe7218b59f955 +MD5 (conglomerate-0.7.8.tar.gz) = 22ca1070b17d1438da155fb5e0c2af58 diff --git a/editors/conglomerate/files/patch-intltool-merge.in b/editors/conglomerate/files/patch-intltool-merge.in new file mode 100644 index 000000000000..54c8a233119d --- /dev/null +++ b/editors/conglomerate/files/patch-intltool-merge.in @@ -0,0 +1,11 @@ +--- intltool-merge.in.orig Wed Nov 12 15:29:28 2003 ++++ intltool-merge.in Wed Nov 12 15:31:54 2003 +@@ -858,7 +858,7 @@ + if ($MULTIPLE_OUTPUT) { + for my $lang (sort keys %po_files_by_lang) { + if ( ! -e $lang ) { +- mkdir $lang or die "Cannot create subdirectory $lang: $!\n"; ++ mkdir $lang, 0777 or die "Cannot create subdirectory $lang: $!\n"; + } + open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; + my $tree = readXml($FILE); diff --git a/editors/conglomerate/files/patch-src-cong-primary-window.c b/editors/conglomerate/files/patch-src-cong-primary-window.c deleted file mode 100644 index bf59f5e11089..000000000000 --- a/editors/conglomerate/files/patch-src-cong-primary-window.c +++ /dev/null @@ -1,19 +0,0 @@ ---- src/cong-primary-window.c.orig Tue Dec 9 17:09:13 2003 -+++ src/cong-primary-window.c Wed Dec 10 20:16:03 2003 -@@ -477,6 +477,7 @@ - g_assert (primary_window); - - if (doc) { -+ gchar *status_text; - primary_window->doc = doc; - g_object_ref(G_OBJECT(doc)); - LOG_PRIMARY_WINDOW_CREATION1 ("Creating v3 widget"); -@@ -562,7 +563,7 @@ - - /* update the statusbar */ - -- gchar *status_text = g_strdup(cong_dispspec_get_name( cong_document_get_dispspec(primary_window->doc) )); -+ status_text = g_strdup(cong_dispspec_get_name( cong_document_get_dispspec(primary_window->doc) )); - #if 1 - gnome_appbar_set_status (GNOME_APPBAR(primary_window->app_bar), - status_text); |