[77045] trunk/dports/devel/geany

[jmr at macports.org]

Revision: 77045
          http://trac.macports.org/changeset/77045
Author:   jmr at macports.org
Date:     2011-03-18 05:40:16 -0700 (Fri, 18 Mar 2011)
Log Message:
-----------
geany: update to 0.20 (#25771; also fixes #23448, #25399), remove archcheck

Modified Paths:
--------------
    trunk/dports/devel/geany/Portfile

Added Paths:
-----------
    trunk/dports/devel/geany/files/vte-sonames.diff

Removed Paths:
-------------
    trunk/dports/devel/geany/files/patch-configure.in.diff

Modified: trunk/dports/devel/geany/Portfile
===================================================================
--- trunk/dports/devel/geany/Portfile	2011-03-18 12:21:47 UTC (rev 77044)
+++ trunk/dports/devel/geany/Portfile	2011-03-18 12:40:16 UTC (rev 77045)
@@ -2,11 +2,10 @@
 # $Id$
 
 PortSystem      1.0
-PortGroup       archcheck 1.0
 
 name            geany
-version         0.18.1
-license         GPL-2
+version         0.20
+license         GPL-2+
 maintainers     nomaintainer
 categories      devel
 platforms       darwin
@@ -23,25 +22,17 @@
 master_sites    http://download.geany.org/
 use_bzip2       yes
 
-checksums       md5     e8be4c0918a8b29ef43bf17fa080c11c \
-                sha1    cb039ac4c6fe3738afb8d0aa9f4ddb024eebb084 \
-                rmd160  56df2c2d41d4dce73d4ecc849e50b3ad4b3a85a8
+checksums       md5     3bd152a7a3a2adc2833a9245e230da3d \
+                sha1    eb8dd15faf8281b346d06ea3231af379c8a758e0 \
+                rmd160  85f4c33711449942fab021c2b8c2396dcedf426c
 
-patchfiles      patch-configure.in.diff
-
-post-patch {
-    reinplace "s|libvte\\.so|${prefix}/lib/libvte.dylib|g" \
-        ${worksrcpath}/src/vte.c
-}
-
+depends_build \
+    port:pkgconfig
 depends_lib \
     port:gettext \
     port:gtk2 \
     port:vte
 
-archcheck.files \
-    lib/libgdk_pixbuf-2.0.dylib \
-    lib/libintl.dylib \
-    lib/libvte.dylib
-
-use_autoconf    yes
+platform darwin {
+    patchfiles-append vte-sonames.diff
+}

Deleted: trunk/dports/devel/geany/files/patch-configure.in.diff
===================================================================
--- trunk/dports/devel/geany/files/patch-configure.in.diff	2011-03-18 12:21:47 UTC (rev 77044)
+++ trunk/dports/devel/geany/files/patch-configure.in.diff	2011-03-18 12:40:16 UTC (rev 77045)
@@ -1,17 +0,0 @@
---- configure.in.orig	2010-02-14 04:41:44.000000000 -0600
-+++ configure.in	2010-03-20 12:42:40.000000000 -0500
-@@ -15,11 +15,14 @@
- AC_PROG_CXX
- # check for C++ compiler explicitly and fail if none is found, do this check
- # after AC_PROG_CXX has set the CXX environment variable
-+if ! test -x "${CXX}"
-+then
- AC_PATH_PROG([CXXCOMPILER], [$CXX])
- if ! test -x "${CXXCOMPILER}"
- then
- 	AC_MSG_ERROR([No C++ compiler found. Please install a C++ compiler.])
- fi
-+fi
- 
- #AC_PROG_RANLIB
- AC_PROG_INSTALL

Added: trunk/dports/devel/geany/files/vte-sonames.diff
===================================================================
--- trunk/dports/devel/geany/files/vte-sonames.diff	                        (rev 0)
+++ trunk/dports/devel/geany/files/vte-sonames.diff	2011-03-18 12:40:16 UTC (rev 77045)
@@ -0,0 +1,33 @@
+--- src/vte.c.orig	2010-08-06 07:45:58.000000000 +1000
++++ src/vte.c	2011-03-18 23:27:16.000000000 +1100
+@@ -203,8 +203,8 @@ void vte_init(void)
+ 	if (module == NULL)
+ 	{
+ 		gint i;
+-		const gchar *sonames[] = {  "libvte.so", "libvte.so.4",
+-									"libvte.so.8", "libvte.so.9", NULL };
++		const gchar *sonames[] = {  "libvte.dylib", "libvte.4.dylib",
++									"libvte.8.dylib", "libvte.9.dylib", NULL };
+ 
+ 		for (i = 0; sonames[i] != NULL && module == NULL; i++)
+ 		{
+@@ -215,7 +215,7 @@ void vte_init(void)
+ 	if (module == NULL)
+ 	{
+ 		vte_info.have_vte = FALSE;
+-		geany_debug("Could not load libvte.so, embedded terminal support disabled");
++		geany_debug("Could not load libvte.dylib, embedded terminal support disabled");
+ 		return;
+ 	}
+ 	else
+--- src/main.c.orig	2010-12-08 00:25:11.000000000 +1100
++++ src/main.c	2011-03-18 23:26:19.000000000 +1100
+@@ -148,7 +148,7 @@ static GOptionEntry entries[] =
+ 	{ "no-session", 's', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &cl_options.load_session, N_("Don't load the previous session's files"), NULL },
+ #ifdef HAVE_VTE
+ 	{ "no-terminal", 't', 0, G_OPTION_ARG_NONE, &no_vte, N_("Don't load terminal support"), NULL },
+-	{ "vte-lib", 0, 0, G_OPTION_ARG_FILENAME, &lib_vte, N_("Filename of libvte.so"), NULL },
++	{ "vte-lib", 0, 0, G_OPTION_ARG_FILENAME, &lib_vte, N_("Filename of libvte.dylib"), NULL },
+ #endif
+ 	{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose_mode, N_("Be verbose"), NULL },
+ 	{ "version", 'V', 0, G_OPTION_ARG_NONE, &show_version, N_("Show version and exit"), NULL },
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110318/b771c70f/attachment.html>