August 2010 - macports-changes - lists.macosforge.org

[70450] trunk/dports/ruby
by jrozner＠macports.org 09 Aug '10

09 Aug '10

Revision: 70450 http://trac.macports.org/changeset/70450 Author: jrozner(a)macports.org Date: 2010-08-09 15:23:43 -0700 (Mon, 09 Aug 2010) Log Message: ----------- added portfile for gli gem Added Paths: ----------- trunk/dports/ruby/rb19-gli/ trunk/dports/ruby/rb19-gli/Portfile Added: trunk/dports/ruby/rb19-gli/Portfile =================================================================== --- trunk/dports/ruby/rb19-gli/Portfile (rev 0) +++ trunk/dports/ruby/rb19-gli/Portfile 2010-08-09 22:23:43 UTC (rev 70450) @@ -0,0 +1,19 @@ +PortSystem 1.0 +PortGroup ruby 1.0 + +ruby.setup gli 1.1.1 gem {} rubygems ruby19 +description Git-Like Interface Command Line Parser +long_description An application and API for describing command line \ + interfaces that can be used to quickly create a shell for executing \ + command-line tasks. The command line user interface is similar to Gits, \ + in that it takes global options, a command, command-specific options, and \ + arguments +license Apache +maintainers nomaintainer +homepage http://davetron5000.github.com/gli/ +platforms darwin +checksums md5 c9d8abf8755fd069adf9fd9749f572cb \ + sha1 42c629d5ab4058f1305d6fc066e3d1baf3cb8ae8 \ + rmd160 09e1e06933c7ff6dba5f45a98185cb9425203965 + +depends_lib port:rb19-ruby

1 0

[70449] trunk/dports/ruby
by jrozner＠macports.org 09 Aug '10

09 Aug '10

Revision: 70449 http://trac.macports.org/changeset/70449 Author: jrozner(a)macports.org Date: 2010-08-09 15:23:29 -0700 (Mon, 09 Aug 2010) Log Message: ----------- added portfile for rainbow gem Added Paths: ----------- trunk/dports/ruby/rb19-rainbow/ trunk/dports/ruby/rb19-rainbow/Portfile Added: trunk/dports/ruby/rb19-rainbow/Portfile =================================================================== --- trunk/dports/ruby/rb19-rainbow/Portfile (rev 0) +++ trunk/dports/ruby/rb19-rainbow/Portfile 2010-08-09 22:23:29 UTC (rev 70449) @@ -0,0 +1,17 @@ +PortSystem 1.0 +PortGroup ruby 1.0 + +ruby.setup rainbow 1.1 gem {} rubygems ruby19 +description Rainbow extends ruby String class adding methods to wrap \ + the string with "ANSI escape codes +long_description \ + ${description} +license MIT +maintainers nomaintainer +homepage http://sickill.net +platforms darwin +checksums md5 3153d4db94ea0a2c3414c43742f88465 \ + sha1 145653d2de28ded1b8e8403175959f5fc80e4971 \ + rmd160 675559e824a0528b6f6af678250dd7f433df051c + +depends_lib port:rb19-ruby

1 0

[70448] branches/gsoc10-configfiles/base/src
by and.damore＠macports.org 09 Aug '10

09 Aug '10

Revision: 70448 http://trac.macports.org/changeset/70448 Author: and.damore(a)macports.org Date: 2010-08-09 13:21:19 -0700 (Mon, 09 Aug 2010) Log Message: ----------- added to entry.o and entryobj.o functions to read out paths with md5 checksums Modified Paths: -------------- branches/gsoc10-configfiles/base/src/cregistry/entry.c branches/gsoc10-configfiles/base/src/cregistry/entry.h branches/gsoc10-configfiles/base/src/registry2.0/entryobj.c Modified: branches/gsoc10-configfiles/base/src/cregistry/entry.c =================================================================== --- branches/gsoc10-configfiles/base/src/cregistry/entry.c 2010-08-09 19:33:55 UTC (rev 70447) +++ branches/gsoc10-configfiles/base/src/cregistry/entry.c 2010-08-09 20:21:19 UTC (rev 70448) @@ -904,8 +904,8 @@ printf("GSOCDBG: \t\t\tinside first if branch\n"); if (sqlite3_bind_text(stmt, 3, md5sums[i], -1, SQLITE_STATIC) == SQLITE_OK) { + int r; printf("GSOCDBG: \t\t\tinside second if branch\n"); - int r; do { r = sqlite3_step(stmt); switch (r) { @@ -1063,6 +1063,94 @@ } /** + * Gets a list of files provided by the given port. These files are in the port + * image and do not necessarily correspond to active files on the filesystem. + * + * TODO: check that the port's installtype is image + * + * @param [in] entry entry to get the list for + * @param [out] files a list of files provided by the port + * @param [out] md5sums a list of files provided by the port + * @param [out] errPtr on error, a description of the error that occurred + * @return the number of files if success; negative if failure + */ +int reg_entry_imagefiles_with_md5(reg_entry* entry, char*** files, + char*** md5sums, reg_error* errPtr) { + reg_registry* reg = entry->reg; + sqlite3_stmt* stmt = NULL; + char* query = "SELECT path,md5sum FROM registry.files WHERE id=? ORDER BY path"; + if ((sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK) + && (sqlite3_bind_int64(stmt, 1, entry->id) == SQLITE_OK)) { + char** result_files = malloc(10*sizeof(char*)); + int result_count_files = 0; + int result_space_files = 10; + char** result_md5sums = malloc(10*sizeof(char*)); + int result_count_md5sums = 0; + int result_space_md5sums = 10; + int r; + const char *text_file; + const char *text_md5sum; + char* element; + + if (!result_files || !result_md5sums) { + return -1; + } + do { + r = sqlite3_step(stmt); + switch (r) { + case SQLITE_ROW: + /* here we're accessing the SQL statement data */ + text_file = (const char*)sqlite3_column_text(stmt, 0); + if (text_file) { + element = strdup(text_file); + if (!element || !reg_listcat((void***)&result_files, &result_count_files, &result_space_files, element)) { + r = SQLITE_ERROR; + } + } + text_md5sum = (const char*)sqlite3_column_text(stmt, 1); + if (text_md5sum) { + element = strdup(text_md5sum); + if (!element || !reg_listcat((void***)&result_md5sums, &result_count_md5sums, &result_space_md5sums, element)) { + r = SQLITE_ERROR; + } + } + break; + case SQLITE_DONE: + case SQLITE_BUSY: + break; + default: + reg_sqlite_error(reg->db, errPtr, query); + break; + } + } while (r == SQLITE_ROW || r == SQLITE_BUSY); + sqlite3_finalize(stmt); + if (r == SQLITE_DONE) { + *files = result_files; + *md5sums = result_md5sums; + /* this is lacking result_count_md5sums, shouldn't be necessary */ + return result_count_files; + } else { + int i; + for (i=0; i<result_count_files; i++) { + free(result_files[i]); + } + for (i=0; i<result_count_md5sums; i++) { + free(result_md5sums[i]); + } + free(result_files); + free(result_md5sums); + return -1; + } + } else { + reg_sqlite_error(reg->db, errPtr, query); + if (stmt) { + sqlite3_finalize(stmt); + } + return -1; + } +} + +/** * Gets a list of files owned by the given port. These files are active in the * filesystem and could be different from the port's imagefiles. * @@ -1131,6 +1219,95 @@ } /** + * Gets a list of files owned by the given port. These files are active in the + * filesystem and could be different from the port's imagefiles. + * + * TODO: check that the port is active + * + * @param [in] entry entry to get the list for + * @param [out] files a list of files owned by the port + * @param [out] md5sums a list of files provided by the port + * @param [out] errPtr on error, a description of the error that occurred + * @return the number of files if success; negative if failure + */ +int reg_entry_files_with_md5(reg_entry* entry, char*** files, char*** md5sums, + reg_error* errPtr) { + reg_registry* reg = entry->reg; + sqlite3_stmt* stmt = NULL; + char* query = "SELECT actual_path,md5sum FROM registry.files WHERE id=? " + "AND active ORDER BY actual_path"; + if ((sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK) + && (sqlite3_bind_int64(stmt, 1, entry->id) == SQLITE_OK)) { + char** result_files = malloc(10*sizeof(char*)); + int result_count_files = 0; + int result_space_files = 10; + char** result_md5sums = malloc(10*sizeof(char*)); + int result_count_md5sums = 0; + int result_space_md5sums = 10; + int r; + const char *text_file; + const char *text_md5sum; + char* element; + + if (!result_files || !result_md5sums) { + return -1; + } + do { + r = sqlite3_step(stmt); + switch (r) { + case SQLITE_ROW: + /* here we're accessing the SQL statement data */ + text_file = (const char*)sqlite3_column_text(stmt, 0); + if (text_file) { + element = strdup(text_file); + if (!element || !reg_listcat((void***)&result_files, &result_count_files, &result_space_files, element)) { + r = SQLITE_ERROR; + } + } + text_md5sum = (const char*)sqlite3_column_text(stmt, 1); + if (text_md5sum) { + element = strdup(text_md5sum); + if (!element || !reg_listcat((void***)&result_md5sums, &result_count_md5sums, &result_space_md5sums, element)) { + r = SQLITE_ERROR; + } + } + break; + case SQLITE_DONE: + case SQLITE_BUSY: + break; + default: + reg_sqlite_error(reg->db, errPtr, query); + break; + } + } while (r == SQLITE_ROW || r == SQLITE_BUSY); + sqlite3_finalize(stmt); + if (r == SQLITE_DONE) { + *files = result_files; + *md5sums = result_md5sums; + /* this is lacking result_count_md5sums, shouldn't be necessary */ + return result_count_files; + } else { + int i; + for (i=0; i<result_count_files; i++) { + free(result_files[i]); + } + for (i=0; i<result_count_md5sums; i++) { + free(result_md5sums[i]); + } + free(result_files); + free(result_md5sums); + return -1; + } + } else { + reg_sqlite_error(reg->db, errPtr, query); + if (stmt) { + sqlite3_finalize(stmt); + } + return -1; + } +} + +/** * Sets an entry's files as being active in the filesystem. This entry will be * subsequently returned by `reg_entry_owner` on those files' path. If all files * are being activated as the names they are in the registry, then `as_files` Modified: branches/gsoc10-configfiles/base/src/cregistry/entry.h =================================================================== --- branches/gsoc10-configfiles/base/src/cregistry/entry.h 2010-08-09 19:33:55 UTC (rev 70447) +++ branches/gsoc10-configfiles/base/src/cregistry/entry.h 2010-08-09 20:21:19 UTC (rev 70448) @@ -84,7 +84,11 @@ int reg_entry_files(reg_entry* entry, char*** files, reg_error* errPtr); int reg_entry_imagefiles(reg_entry* entry, char*** files, reg_error* errPtr); - +int reg_entry_files_with_md5( + reg_entry* entry, char*** files, char*** md5sums, reg_error* errPtr); +int reg_entry_imagefiles_with_md5( + reg_entry* entry, char*** files, char*** md5sums, reg_error* errPtr); + int reg_entry_activate(reg_entry* entry, char** files, char** as_files, int file_count, reg_error* errPtr); int reg_entry_deactivate(reg_entry* entry, char** files, int file_count, Modified: branches/gsoc10-configfiles/base/src/registry2.0/entryobj.c =================================================================== --- branches/gsoc10-configfiles/base/src/registry2.0/entryobj.c 2010-08-09 19:33:55 UTC (rev 70447) +++ branches/gsoc10-configfiles/base/src/registry2.0/entryobj.c 2010-08-09 20:21:19 UTC (rev 70448) @@ -266,6 +266,43 @@ } } +static int entry_obj_files_with_md5(Tcl_Interp* interp, reg_entry* entry, int objc, + Tcl_Obj* CONST objv[]) { + reg_registry* reg = registry_for(interp, reg_attached); + if (objc != 2) { + Tcl_WrongNumArgs(interp, 1, objv, "files_with_md5"); + return TCL_ERROR; + } else if (reg == NULL) { + return TCL_ERROR; + } else { + char** files; + char** md5sums; + reg_error error; + /* call to entry.c function */ + int file_count = reg_entry_files_with_md5(entry, &files, &md5sums, &error); + int i; + if (file_count >= 0) { + Tcl_Obj** objs; + int retval = TCL_ERROR; + if (list_string_to_obj(&objs, files, file_count, &error)) { + Tcl_Obj* result = Tcl_NewListObj(file_count, objs); + /* sending the result to Tcl, an object in this case */ + Tcl_SetObjResult(interp, result); + free(objs); + retval = TCL_OK; + } else { + retval = registry_failed(interp, &error); + } + for (i=0; i<file_count; i++) { + free(files[i]); + } + free(files); + return retval; + } + return registry_failed(interp, &error); + } +} + static int entry_obj_imagefiles(Tcl_Interp* interp, reg_entry* entry, int objc, Tcl_Obj* CONST objv[]) { reg_registry* reg = registry_for(interp, reg_attached); @@ -300,6 +337,41 @@ } } +static int entry_obj_imagefiles_with_md5(Tcl_Interp* interp, reg_entry* entry, int objc, + Tcl_Obj* CONST objv[]) { + reg_registry* reg = registry_for(interp, reg_attached); + if (objc != 2) { + Tcl_WrongNumArgs(interp, 1, objv, "imagefiles_with_md5"); + return TCL_ERROR; + } else if (reg == NULL) { + return TCL_ERROR; + } else { + char** files; + char** md5sums; + reg_error error; + int file_count = reg_entry_imagefiles_with_md5(entry, &files, &md5sums, &error); + int i; + if (file_count >= 0) { + Tcl_Obj** objs; + int retval = TCL_ERROR; + if (list_string_to_obj(&objs, files, file_count, &error)) { + Tcl_Obj* result = Tcl_NewListObj(file_count, objs); + Tcl_SetObjResult(interp, result); + free(objs); + retval = TCL_OK; + } else { + retval = registry_failed(interp, &error); + } + for (i=0; i<file_count; i++) { + free(files[i]); + } + free(files); + return retval; + } + return registry_failed(interp, &error); + } +} + static int entry_obj_activate(Tcl_Interp* interp, reg_entry* entry, int objc, Tcl_Obj* CONST objv[]) { reg_registry* reg = registry_for(interp, reg_attached); @@ -462,7 +534,9 @@ { "map_with_md5", entry_obj_filemap_with_md5 }, { "unmap", entry_obj_filemap }, { "files", entry_obj_files }, + { "files_with_md5", entry_obj_files_with_md5 }, { "imagefiles", entry_obj_imagefiles }, + { "imagefiles_with_md5", entry_obj_imagefiles_with_md5 }, { "activate", entry_obj_activate }, { "deactivate", entry_obj_filemap }, /* dep map */ @@ -483,7 +557,6 @@ int entry_obj_cmd(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]) { int cmd_index; - int len=0; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "cmd ?arg ...?"); return TCL_ERROR;

1 0

[70447] trunk/dports/games/sounddecompress/Portfile
by ryandesign＠macports.org 09 Aug '10

09 Aug '10

Revision: 70447 http://trac.macports.org/changeset/70447 Author: ryandesign(a)macports.org Date: 2010-08-09 12:33:55 -0700 (Mon, 09 Aug 2010) Log Message: ----------- sounddecompress: fix formatting of notes for MacPorts 1.9+ Modified Paths: -------------- trunk/dports/games/sounddecompress/Portfile Modified: trunk/dports/games/sounddecompress/Portfile =================================================================== --- trunk/dports/games/sounddecompress/Portfile 2010-08-09 19:31:14 UTC (rev 70446) +++ trunk/dports/games/sounddecompress/Portfile 2010-08-09 19:33:55 UTC (rev 70447) @@ -20,12 +20,13 @@ sounds get decompressed incorrectly, resulting in \ silence or static. Run this tool to fix the sounds. -notes To have SoundDecompress decompress the sounds in \ - a Myst Online: URU Live installation installed by \ - the mystonline-cider or mystonline-wine ports, run \ - \n\ - \nsounddecompress.py -u ${prefix}/share/mystonline/data +notes " +To have SoundDecompress decompress the sounds in a Myst Online: URU Live\ +installation installed by the mystonline-cider or mystonline-wine ports, run: +sounddecompress.py -u ${prefix}/share/mystonline/data +" + distname ${name}_v[strsed ${version} {g/\.//}] use_bzip2 yes

1 0

[70446] trunk/dports/php/php5-gmagick/Portfile
by ryandesign＠macports.org 09 Aug '10

09 Aug '10

Revision: 70446 http://trac.macports.org/changeset/70446 Author: ryandesign(a)macports.org Date: 2010-08-09 12:31:14 -0700 (Mon, 09 Aug 2010) Log Message: ----------- php5-gmagick: update to 1.0.7b1 Modified Paths: -------------- trunk/dports/php/php5-gmagick/Portfile Modified: trunk/dports/php/php5-gmagick/Portfile =================================================================== --- trunk/dports/php/php5-gmagick/Portfile 2010-08-09 19:18:39 UTC (rev 70445) +++ trunk/dports/php/php5-gmagick/Portfile 2010-08-09 19:31:14 UTC (rev 70446) @@ -4,7 +4,7 @@ PortGroup archcheck 1.0 PortGroup php5extension 1.0 -php5extension.setup gmagick 1.0.4b1 pecl +php5extension.setup gmagick 1.0.7b1 pecl license PHP categories php devel platforms darwin @@ -15,9 +15,9 @@ Gmagick is a php extension to create, modify and obtain meta information \ of images using the GraphicsMagick API. -checksums md5 70a8dcfbcf9392b1a0d145f3c3b40a33 \ - sha1 d81543c104a8efcd66bb696433396ec8d6ec8751 \ - rmd160 4c7f14abb49be6f7335478b9a8308cff9c0acbd4 +checksums md5 058feb0645f1fc04e5337962319a70ed \ + sha1 451cb82e3ad82b9cfb67b7434c1ce9ab352cfb7e \ + rmd160 a2c96528d8cee1f4e2e9477b7f6029a766b00eff depends_lib-append \ port:GraphicsMagick

1 0

[70445] trunk/dports/devel/grails/Portfile
by breskeby＠macports.org 09 Aug '10

09 Aug '10

Revision: 70445 http://trac.macports.org/changeset/70445 Author: breskeby(a)macports.org Date: 2010-08-09 12:18:39 -0700 (Mon, 09 Aug 2010) Log Message: ----------- version upgrade to 1.3.4 Modified Paths: -------------- trunk/dports/devel/grails/Portfile Modified: trunk/dports/devel/grails/Portfile =================================================================== --- trunk/dports/devel/grails/Portfile 2010-08-09 18:18:36 UTC (rev 70444) +++ trunk/dports/devel/grails/Portfile 2010-08-09 19:18:39 UTC (rev 70445) @@ -3,7 +3,7 @@ PortSystem 1.0 name grails -version 1.3.3 +version 1.3.4 revision 1 categories devel java maintainers breskeby @@ -20,9 +20,9 @@ conflicts grails-devel distname ${name}-${version} master_sites http://dist.codehaus.org/grails -checksums md5 2573fcd2a50d9f2f4b07450638c56b7c \ - sha1 de64b06c241790d170f161d3727875e72bc160e4 \ - rmd160 ba987b01a0061332140ebf3f38c3d7bffa8c66f2 +checksums md5 d4c968cf4869cf7afdaae0b17c85beba \ + sha1 00d7f70e1e2107488b178097c5c3447c27be6e65 \ + rmd160 7a8433a5a919a9238ec0274d418d119daede9c0d worksrcdir ${name}-${version} set workTarget ""

1 0

[70444] trunk/dports/kde/ktorrent/Portfile
by michaelld＠macports.org 09 Aug '10

09 Aug '10

Revision: 70444 http://trac.macports.org/changeset/70444 Author: michaelld(a)macports.org Date: 2010-08-09 11:18:36 -0700 (Mon, 09 Aug 2010) Log Message: ----------- Bump to 3.3.4 (last v3 series). Fix depends_lib and depends_build. Fix location of QCA. Modified Paths: -------------- trunk/dports/kde/ktorrent/Portfile Modified: trunk/dports/kde/ktorrent/Portfile =================================================================== --- trunk/dports/kde/ktorrent/Portfile 2010-08-09 18:16:47 UTC (rev 70443) +++ trunk/dports/kde/ktorrent/Portfile 2010-08-09 18:18:36 UTC (rev 70444) @@ -1,3 +1,4 @@ +# -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 @@ -4,7 +5,7 @@ PortGroup kde4 1.0 name ktorrent -version 3.2 +version 3.3.4 categories kde kde4 maintainers nomaintainer description KDE4 bittorrent client. @@ -14,14 +15,17 @@ homepage http://www.kde.org master_sites http://ktorrent.org/downloads/${version}/ use_bzip2 yes -checksums md5 e215de7a711b3f9c33044bf97a6d8bfb \ - sha1 7cc7c50f8860ef31aca3c93f65eee131cc84c968 \ - rmd160 e04cf261b22f191f6bda4bccb8b56fdcd734b944 +checksums md5 7d7dba06a78d09494199bd4ef82e5527 \ + sha1 732527854f734d5fcd038348273378d0b1f8158f \ + rmd160 93ae20f720e159ec53c4d1325c74fef0ec953db4 -depends_lib-append port:kdebase4-runtime \ +depends_lib-append port:kdebase4-runtime port:kdepimlibs4 \ port:qca port:gmp +depends_build-append bin:perl:perl5 + +set qca_dir ${prefix}/libexec/qt4-mac + configure.args-append ../${distname} \ - -DQCA2_LIBRARIES=${prefix}/lib/libqca.2.dylib \ - -DQCA2_INCLUDE_DIR=${prefix}/include/QtCrypto - + -DQCA2_LIBRARIES=${qca_dir}/lib/libqca.2.dylib \ + -DQCA2_INCLUDE_DIR=${qca_dir}/include/QtCrypto

1 0

[70443] trunk/dports/kde/kdegraphics4/Portfile
by michaelld＠macports.org 09 Aug '10

09 Aug '10

Revision: 70443 http://trac.macports.org/changeset/70443 Author: michaelld(a)macports.org Date: 2010-08-09 11:16:47 -0700 (Mon, 09 Aug 2010) Log Message: ----------- Revision bump to find new QCA location. Modified Paths: -------------- trunk/dports/kde/kdegraphics4/Portfile Modified: trunk/dports/kde/kdegraphics4/Portfile =================================================================== --- trunk/dports/kde/kdegraphics4/Portfile 2010-08-09 18:16:19 UTC (rev 70442) +++ trunk/dports/kde/kdegraphics4/Portfile 2010-08-09 18:16:47 UTC (rev 70443) @@ -6,7 +6,7 @@ name kdegraphics4 version 4.4.5 -revision 1 +revision 2 categories kde kde4 maintainers snc sharky description KDE4 graphics applications

1 0

[70442] trunk/dports/kde/kdenetwork4/Portfile
by michaelld＠macports.org 09 Aug '10

09 Aug '10

Revision: 70442 http://trac.macports.org/changeset/70442 Author: michaelld(a)macports.org Date: 2010-08-09 11:16:19 -0700 (Mon, 09 Aug 2010) Log Message: ----------- Fix for new QCA install location. Modified Paths: -------------- trunk/dports/kde/kdenetwork4/Portfile Modified: trunk/dports/kde/kdenetwork4/Portfile =================================================================== --- trunk/dports/kde/kdenetwork4/Portfile 2010-08-09 18:15:01 UTC (rev 70441) +++ trunk/dports/kde/kdenetwork4/Portfile 2010-08-09 18:16:19 UTC (rev 70442) @@ -6,6 +6,7 @@ name kdenetwork4 version 4.4.5 +revision 1 categories kde kde4 network maintainers snc sharky description KDE4 networking applications @@ -28,9 +29,11 @@ port:libotr depends_run-append port:qca-ossl +set qca_dir ${prefix}/libexec/qt4-mac + configure.args-append ../${distname} \ - -DQCA2_LIBRARIES=${prefix}/lib/libqca.2.dylib \ - -DQCA2_INCLUDE_DIR=${prefix}/include/QtCrypto + -DQCA2_LIBRARIES=${qca_dir}/lib/libqca.2.dylib \ + -DQCA2_INCLUDE_DIR=${qca_dir}/include/QtCrypto variant no_kopete conflicts libmsn xmms description "Do not install Kopete instant messaging client" { depends_lib-delete port:qca \

1 0

[70441] trunk/dports/kde/kdegraphics4/Portfile
by michaelld＠macports.org 09 Aug '10

09 Aug '10

Revision: 70441 http://trac.macports.org/changeset/70441 Author: michaelld(a)macports.org Date: 2010-08-09 11:15:01 -0700 (Mon, 09 Aug 2010) Log Message: ----------- Fix for new QCA install location. Modified Paths: -------------- trunk/dports/kde/kdegraphics4/Portfile Modified: trunk/dports/kde/kdegraphics4/Portfile =================================================================== --- trunk/dports/kde/kdegraphics4/Portfile 2010-08-09 18:12:03 UTC (rev 70440) +++ trunk/dports/kde/kdegraphics4/Portfile 2010-08-09 18:15:01 UTC (rev 70441) @@ -29,9 +29,11 @@ patchfiles patch-gwenview-lib-document-view-videoviewadapter.cpp.patch \ patch-okular-core-audioplayer.cpp.patch +set qca_dir ${prefix}/libexec/qt4-mac + configure.args-append ../${distname} \ - -DQCA2_LIBRARIES=${prefix}/lib/libqca.2.dylib \ - -DQCA2_INCLUDE_DIR=${prefix}/include/QtCrypto \ + -DQCA2_LIBRARIES=${qca_dir}/lib/libqca.2.dylib \ + -DQCA2_INCLUDE_DIR=${qca_dir}/include/QtCrypto \ -DGWENVIEW_SEMANTICINFO_BACKEND=None variant gphoto2 description {Required to build the kamera project} {

1 0