CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2011/07/21 00:27:21 Modified files: www/sope : Makefile distinfo Removed files: www/sope/patches: patch-sope-core_NGExtensions_FdExt_subproj_NSString+Encoding_m patch-sope-mime_NGMime_GNUmakefile_preamble patch-sope-mime_NGMime_NGMimeRFC822DateHeaderFieldParser_m Log message: Update SOPE to 1.3.8a, zap a couple of patches that made it upstream. OK landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2011/07/21 00:30:44 Modified files: www/sogo : Makefile distinfo www/sogo/pkg : PLIST Removed files: www/sogo/patches: patch-SOPE_GDLContentStore_GCSFolderManager_m patch-SoObjects_SOGo_GNUmakefile_preamble patch-configure Log message: update SOGo to 1.3.8a, also here zapping patches that made it upstream. OK landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2011/07/21 00:37:09 Modified files: multimedia/gstreamer-0.10/mm: Makefile distinfo multimedia/gstreamer-0.10/mm/pkg: PLIST Log message: Update to gstreamermm-0.10.10.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2011/07/21 02:02:44 Modified files: fonts/terminus-font: Makefile fonts/terminus-font/pkg: PLIST Log message: Don't install the copy of 8x12 normal fonts which get installed as bold. This lets X synthesize its own, so bold characters are distinct again. Upstream don't seem to like this (there is no space for a bold font in a 6x12 matrix) but everyone else would rather have distinct bold chars. Req by joshe@, landry@. OK LEVAI Daniel (maintainer).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2011/07/21 03:54:51 Modified files: www: Makefile Log message: Add dokuwiki
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2011/07/21 06:13:54 Modified files: infrastructure/db: user.list Log message: Add _inadyn ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2011/07/21 06:17:02 Log message: Import inadyn inadyn is a C based client used to update DNS entries. This is a fork of the original INADYN implementation from Narcis Ilisei. Most of the fixes and additions from the new upstream by Christoph Brill have been added. However, this project is not a fork off of Christoph's repository, but rather a reengineered version of the original 1.96.2 release with all additional patches audited and merged separately. Additionally a further set of code cleanups, features and bug fixes have been added. ok ajacoutot@ Status: Vendor Tag: pea Release Tags: pea_20110721 N ports/net/inadyn/distinfo N ports/net/inadyn/Makefile N ports/net/inadyn/files/inadyn.conf N ports/net/inadyn/patches/patch-src_dyndns_c N ports/net/inadyn/patches/patch-src_ip_c N ports/net/inadyn/patches/patch-Makefile N ports/net/inadyn/patches/patch-src_inadyn_cmd_c N ports/net/inadyn/pkg/PLIST N ports/net/inadyn/pkg/DESCR N ports/net/inadyn/pkg/inadyn.rc No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2011/07/21 06:19:11 Modified files: net: Makefile Log message: Add inadyn
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2011/07/21 06:29:21 Modified files: textproc/pdftk : Makefile Log message: s/$(MACHINE)/$(MACHINE_ARCH)/ Fix a build error on macppc reported by ajacoutot@ ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2011/07/21 12:36:36 Modified files: www/links+ : Makefile Added files: www/links+/patches: patch-dip_c Log message: - add a patch from pkgsrc to prevent links+ (in gui mode) from crashing on certain webpages after recent png update. though links was doing bad things, not png..
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2011/07/21 23:25:27 Modified files: productivity/sunbird: Makefile Added files: productivity/sunbird/files: nsSound.cpp sunbird.desktop productivity/sunbird/patches: patch-config_autoconf_mk_in patch-config_rules_mk patch-configure_in patch-directory_sdks_c-sdk_configure_in patch-mailnews_mime_src_mimemsg_cpp patch-mozilla_accessible_src_atk_nsAppRootAccessible_cpp patch-mozilla_browser_app_application_ini patch-mozilla_browser_app_profile_firefox_js patch-mozilla_browser_components_certerror_content_aboutCertError_xhtml patch-mozilla_browser_components_nsBrowserGlue_js patch-mozilla_build_unix_mozilla_in patch-mozilla_build_unix_run-mozilla_sh patch-mozilla_configure_in patch-mozilla_content_canvas_src_nsGLPbufferGLX_cpp patch-mozilla_content_canvas_src_nsGLPbufferOSMesa_cpp patch-mozilla_content_events_src_nsContentEventHandler_cpp patch-mozilla_content_media_nsAudioStream_cpp patch-mozilla_content_xslt_public_txDouble_h patch-mozilla_content_xslt_src_base_txDouble_cpp patch-mozilla_extensions_auth_nsAuthGSSAPI_cpp patch-mozilla_extensions_pref_system-pref_src_gconf_nsSystemPrefService_cpp patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell_cpp patch-mozilla_gfx_qcms_iccread_c patch-mozilla_gfx_qcms_qcmstypes_h patch-mozilla_gfx_src_psshared_nsCUPSShim_cpp patch-mozilla_gfx_src_thebes_Makefile_in patch-mozilla_js_ctypes_libffi_configure patch-mozilla_js_ctypes_libffi_src_dlmalloc_c patch-mozilla_js_src_configure_in patch-mozilla_js_src_jsgc_cpp patch-mozilla_js_src_jslock_cpp patch-mozilla_js_src_jsnum_h patch-mozilla_js_src_nanojit_NativeSparc_cpp patch-mozilla_js_src_nanojit_Nativei386_cpp patch-mozilla_js_src_nanojit_avmplus_h patch-mozilla_js_src_xpconnect_shell_Makefile_in patch-mozilla_js_src_xpconnect_src_Makefile_in patch-mozilla_js_src_xpconnect_src_dom_quickstubs_cpp_diff patch-mozilla_layout_build_Makefile_in patch-mozilla_media_liboggplay_src_liboggplay_std_semaphore_h patch-mozilla_media_liboggz_include_oggz_oggz_off_t_generated_h patch-mozilla_media_libsydneyaudio_include_sydney_audio_h patch-mozilla_media_libsydneyaudio_src_Makefile_in patch-mozilla_modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp patch-mozilla_modules_plugin_base_src_nsPluginNativeWindowGtk2_cpp patch-mozilla_modules_plugin_base_src_nsPluginsDirUnix_cpp patch-mozilla_other-licenses_branding_firefox_pref_firefox-branding_js patch-mozilla_parser_html_Makefile_in patch-mozilla_security_coreconf_OpenBSD_mk patch-mozilla_security_coreconf_UNIX_mk patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js patch-mozilla_security_manager_ssl_src_Makefile_in patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp patch-mozilla_storage_src_mozStorageConnection_cpp
Re: textproc/pdftk broken on ppc?
On Thu, 21 Jul 2011, Antoine Jacoutot wrote: Hi. pdftk seems broken on macppc. I have no time to look at it right now so if anyone is interested... I've spotted the error... c++ -fdollars-in-identifiers -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -I/usr/local/include/c++/4.2.4 -I/usr/local/lib/gcc/macppc-unknown-openbsd4.9/4.2.4/include -DPDFTK_VER=\1.44\ -O2 -pipe -L/usr/local/lib -I../java pdftk.cc -c /usr/local/lib/gcc/macppc-unknown-openbsd$(OSREV)/4.2.4/include vs. /usr/local/lib/gcc/powerpc-unknown-openbsd$(OSREV)/4.2.4/include /usr/local/include/c++/4.2.4/gcj/javaprims.h:19:31: error: gcj/libgcj-config.h: No such file or directory Antoine Ciao, David
Re: textproc/pdftk broken on ppc?
On Thu, 21 Jul 2011, Antoine Jacoutot wrote:
Hi.
pdftk seems broken on macppc. I have no time to look at it right now so
if anyone is interested...
This should be the diff, but I have no macppc to test it.
Index: Makefile
===
RCS file: /cvs/ports/textproc/pdftk/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile20 May 2011 10:09:57 - 1.1.1.1
+++ Makefile21 Jul 2011 08:34:03 -
@@ -3,6 +3,7 @@
COMMENT= pdf swiss army knife
VERSION= 1.44
DISTNAME= pdftk-$(VERSION)
+REVISION= 0
EXTRACT_SUFX= -src.zip
CATEGORIES=textproc
@@ -33,7 +34,7 @@ GCJ?= gcj
GCJH?= gcjh
GJAR?= ejar
-CONFIG=$(MACHINE)-unknown-openbsd$(OSREV)
+CONFIG=$(MACHINE_ARCH)-unknown-openbsd$(OSREV)
GCJFLAGS?= ${CXXFLAGS}
CPPFLAGS+= -fdollars-in-identifiers \
-DPATH_DELIM=0x2f \
Re: devel/cmake: remove workaround for arm
-- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /usr/bin/cc terminate called after throwing an instance of 'std::length_error' what(): basic_string::_S_create Abort trap (core dumped) - Error when bootstrapping CMake: Problem while running initial CMake - So cmake still has problems on arm with a new libsupc++ that is doing SJLJ exceptions. Anyone have ideas? GNU gdb 6.3 Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type show copying to see the conditions. There is absolutely no warranty for GDB. Type show warranty for details. This GDB was configured as arm-unknown-openbsd5.0... (no debugging symbols found) Core was generated by `cmake'. Program terminated with signal 6, Aborted. Reading symbols from /usr/lib/libstdc++.so.52.0...done. Loaded symbols for /usr/lib/libstdc++.so.52.0 Reading symbols from /usr/lib/libm.so.7.0...done. Loaded symbols for /usr/lib/libm.so.7.0 Reading symbols from /usr/lib/libc.so.60.1...done. Loaded symbols for /usr/lib/libc.so.60.1 Reading symbols from /usr/libexec/ld.so...done. Loaded symbols for /usr/libexec/ld.so #0 0x4a029b68 in kill () from /usr/lib/libc.so.60.1 (gdb) bt #0 0x4a029b68 in kill () from /usr/lib/libc.so.60.1 #1 0x4a08cca8 in abort () at /usr/src/lib/libc/stdlib/abort.c:68 #2 0x43acdf58 in __gnu_cxx::__verbose_terminate_handler () at /usr/src/gnu/lib/libstdc++-v3/../../gcc/libstdc++-v3/libsupc++/vterminate.cc:98 #3 0x43b2301c in __cxxabiv1::__terminate ( handler=0x43acdd84 __gnu_cxx::__verbose_terminate_handler()) at /usr/src/gnu/lib/libstdc++-v3/../../gcc/libstdc++-v3/libsupc++/eh_terminate.cc:43 #4 0x43b230a4 in std::terminate () at /usr/src/gnu/lib/libstdc++-v3/../../gcc/libstdc++-v3/libsupc++/eh_terminate.cc:53 #5 0x43b230a4 in std::terminate () at /usr/src/gnu/lib/libstdc++-v3/../../gcc/libstdc++-v3/libsupc++/eh_terminate.cc:53 Previous frame identical to this frame (corrupt stack?)
Re: devel/cmake: remove workaround for arm
On Thu, Jul 21, 2011 at 10:49 AM, Stuart Henderson s...@spacehopper.org wrote: -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /usr/bin/cc terminate called after throwing an instance of 'std::length_error' what(): basic_string::_S_create Abort trap (core dumped) - Error when bootstrapping CMake: Problem while running initial CMake - So cmake still has problems on arm with a new libsupc++ that is doing SJLJ exceptions. Anyone have ideas? A build of cmake with CONFIGURE_ARGS+=-DCMAKE_BUILD_TYPE=DEBUG would be good... ciao David GNU gdb 6.3 Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type show copying to see the conditions. There is absolutely no warranty for GDB. Type show warranty for details. This GDB was configured as arm-unknown-openbsd5.0... (no debugging symbols found)
NORPHI Pictures - la nouvelle banque d'images
The new picture library Français : www.norphipictures.com English : www.norphipictures.com/en [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] Recherche par catalogue : * Architecture * Alimentaire * Image d'exception * Industrie * Tradition * Fond et matière * Evénement * Nature * Transport * Animal * Maison * Habillement * Personnage Les plus de NORPHI Pictures : photos et dessins anciens [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] Site NORPHI Pictures : Ce site a été créé par des professionnels de la communication du marketing et du web, nos formations sont artistiques, avec les divers métiers tel que, photographe publicitaire et artistique, graphiste designer et décorateur. Il veut répondre aux attentes des professionnels des métiers d'arts graphiques de la publicité et de tout autre métier graphique et artistique. Son évolution se fera avec vous par vos demandes, vos souhaits et vos aspirations. NORPHIpictures est un site vivant et évolutif, avec un système de recherche ou les mots clés ne sont plus prioritaires, mais ou la priorité est donnée aux catalogues.Ce mode de recherche sera constamment en évolution, ceci afin d’éviter l’erreur humaine de la frappe et les erreurs liées aux trop nombreux mots clés. Pour ne plus recevoir d'emails de notre part, cliquez-ici If you no longer wish to receive email from us, click here
HOW ARE YOU？
时间：2011年10月19日 地点：广州花园酒店国际会 议中心（白金五星） 工业品采购清单： 建材、机械、电子电器、五 金配件... 时间：2011年10月27日 地点：广州花园酒店国际会 议中心（白金五星） 消费品采购清单： 日用消费品、礼品、家具装 饰品.. 主办单位： 商务部国际贸易经济合作研究院 支持单位： 广东对外经济贸易合作厅 中国国际贸易促进委员会广东省分会 中国国际商会广东商会 广东国际经贸服务中心 承办单位： 商务部研究院商务促进处 广州环贸商务服务有限公司 1.与传统展会比，费用非常低，但成效非常的高。 2.组委会提前精准配对，到会采购商完全对口。 3.采购商坐等供应商，省时省力，轻松与对口买家洽谈。 4.短时间内能见到大量买家，效率非常的高。 5.无障碍沟通，大会全程提供翻译服务。 6.环境幽雅，洽谈质量高，成交几率大。 第九届逆向外贸采购洽谈会4月21日与27日在广州举行，工业品专场到会采购商328 家，消费品专场到会采购商206家，到会买家都是经过严格筛选的优质采购商，其中不乏世界500强的大买家，采购会规模创下历届之最。87％的客商找到意向客户，其中68％的参会企业当场签成定单，几乎100％的中外客商对我们这创新的交易模式给予了高度评价。 普通参会服务内容： 1.两人的会务费、中外客商交流晚宴、翻译服务。 2.编辑《参会供应商名录》及《参会采购商名录》， 向所有到会客商派发。 3.赠送中国产品网（trade-ok.com）会员服务。 除享受普通参会所有服务外，额外享受： 1.提供洽谈会现场样品展示台一张 2赠送《中国产品》广交会特刊半版 广告，录入光盘。http://www.trade-ok.com/publication/A.asp 3.赠送对口买家名片100张。 除享受普通参会所有服务外，额外享受： 1.提供洽谈会现场样品展示陈一张。 2.提供洽谈会现场产品宣传海报一张。 3.赠送《中国产品》广交会特刊 整版 广告，录入光盘 。 4.赠送对口买家名片200张。 5.前30家获赠参观广交会名额（限1人1天）。 联系人：钟小姐 | 服务热线：86-20-38900306 | 传真:86-20-38801922QQ：919913958
Re: devel/cmake: remove workaround for arm
On 2011/07/21 11:03, David Coppa wrote: On Thu, Jul 21, 2011 at 10:49 AM, Stuart Henderson s...@spacehopper.org wrote: -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /usr/bin/cc terminate called after throwing an instance of 'std::length_error' what(): basic_string::_S_create Abort trap (core dumped) - Error when bootstrapping CMake: Problem while running initial CMake - So cmake still has problems on arm with a new libsupc++ that is doing SJLJ exceptions. Anyone have ideas? A build of cmake with CONFIGURE_ARGS+=-DCMAKE_BUILD_TYPE=DEBUG would be good... ciao David Just started one, it should reach that stage in 2 hours or so.
Re: devel/cmake: remove workaround for arm
On 2011/07/21 12:24, Stuart Henderson wrote: On 2011/07/21 11:03, David Coppa wrote: On Thu, Jul 21, 2011 at 10:49 AM, Stuart Henderson s...@spacehopper.org wrote: -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /usr/bin/cc terminate called after throwing an instance of 'std::length_error' what(): basic_string::_S_create Abort trap (core dumped) - Error when bootstrapping CMake: Problem while running initial CMake - So cmake still has problems on arm with a new libsupc++ that is doing SJLJ exceptions. Anyone have ideas? A build of cmake with CONFIGURE_ARGS+=-DCMAKE_BUILD_TYPE=DEBUG would be good... ciao David Just started one, it should reach that stage in 2 hours or so. This build option doesn't seem to do anything during bootstrap.
Re: devel/cmake: remove workaround for arm
On Thu, Jul 21, 2011 at 5:02 PM, Stuart Henderson s...@spacehopper.org wrote: On 2011/07/21 12:24, Stuart Henderson wrote: On 2011/07/21 11:03, David Coppa wrote: On Thu, Jul 21, 2011 at 10:49 AM, Stuart Henderson s...@spacehopper.org wrote: -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /usr/bin/cc terminate called after throwing an instance of 'std::length_error' what(): basic_string::_S_create Abort trap (core dumped) - Error when bootstrapping CMake: Problem while running initial CMake - So cmake still has problems on arm with a new libsupc++ that is doing SJLJ exceptions. Anyone have ideas? A build of cmake with CONFIGURE_ARGS+=-DCMAKE_BUILD_TYPE=DEBUG would be good... ciao David Just started one, it should reach that stage in 2 hours or so. This build option doesn't seem to do anything during bootstrap. omg! :( The standard method DEBUG=-ggdb3 -O0 make should work then... sorry, david
ruby-rmagick/ImageMagick pthread problem
(no maintainer on ruby-rmagick or ImageMagick) is this a problem with the ruby module or ImageMagick? this is on amd64 -current. ~ sudo pkg_add -i ruby-rmagick Ambiguous: choose dependency for ruby-rmagick-2.9.0p3: a 0: ImageMagick-6.6.6.10p0 1: ImageMagick-6.6.6.10p0-no_x11 Your choice: 1 ruby-rmagick-2.9.0p3:ImageMagick-6.6.6.10p0-no_x11: ok ruby-rmagick-2.9.0p3: ok ~ irb irb(main):001:0 require rubygems = true irb(main):002:0 require RMagick /usr/local/bin/ruby18:/usr/local/lib/libMagickCore.so.2.0: undefined symbol 'pthread_mutexattr_init' lazy binding failed! /usr/local/lib/ruby/gems/1.8/gems/rmagick-2.9.0/lib/RMagick2.so: [BUG] Segmentation fault ruby 1.8.7 (2011-02-18 patchlevel 334) [x86_64-openbsd4.9] Abort Exit 134
Re: [WIP] audio/cmus (with a backend for sndio)
On Sun, 17 Jul 2011 16:52:24 +0200 (CEST) Donovan Watteau tso...@gmail.com wrote: Hi, Attached is a port of cmus, an ncurses-based music player. Works fine on amd64 current. I can't comment on the actual port itself since I'm pretty useless in that area, but I really like this program. Any porters here care to take a closer look at it? Thanks.
Re: ruby-rmagick/ImageMagick pthread problem
On Thu, Jul 21, 2011 at 10:51 AM, joshua stein j...@openbsd.org wrote: (no maintainer on ruby-rmagick or ImageMagick) is this a problem with the ruby module or ImageMagick? this is on amd64 -current. ~ sudo pkg_add -i ruby-rmagick Ambiguous: choose dependency for ruby-rmagick-2.9.0p3: a 0: ImageMagick-6.6.6.10p0 1: ImageMagick-6.6.6.10p0-no_x11 Your choice: 1 ruby-rmagick-2.9.0p3:ImageMagick-6.6.6.10p0-no_x11: ok ruby-rmagick-2.9.0p3: ok ~ irb irb(main):001:0 require rubygems = true irb(main):002:0 require RMagick /usr/local/bin/ruby18:/usr/local/lib/libMagickCore.so.2.0: undefined symbol 'pthread_mutexattr_init' lazy binding failed! /usr/local/lib/ruby/gems/1.8/gems/rmagick-2.9.0/lib/RMagick2.so: [BUG] Segmentation fault ruby 1.8.7 (2011-02-18 patchlevel 334) [x86_64-openbsd4.9] Abort Exit 134 Any ruby extensions that use libpthread and are not linked with -lpthread (which has issues and won't be added) need to LD_PRELOAD=/usr/lib/libpthread.so.x.y. Alternatively, you could try ruby 1.9 (sudo pkg_add -i ruby19-rmagick), which links with libpthread and shouldn't have this issue. Jeremy
Re: ruby-rmagick/ImageMagick pthread problem
On 2011-07-21, Jeremy Evans jeremyeva...@gmail.com wrote: Any ruby extensions that use libpthread and are not linked with -lpthread (which has issues and won't be added) need to LD_PRELOAD=/usr/lib/libpthread.so.x.y. Just LD_PRELOAD=libpthread.so is enough, ld.so can pick the version by itself.
Re: devel/cmake: remove workaround for arm
-- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /usr/bin/cc terminate called after throwing an instance of 'std::length_error' what(): basic_string::_S_create Abort trap (core dumped) - Error when bootstrapping CMake: Problem while running initial CMake - So cmake still has problems on arm with a new libsupc++ that is doing SJLJ exceptions. Anyone have ideas? I have a few arm compiler bugfixes coming soon, which _might_ help. I'm not sure I'll have time to try them on cmake though. Miod
Re: png busted?
I replied to this thread because I don't have the original png update thread around anymore. I'm seeing this in terminal when playing pokerth: libpng warning: Interlace handling should be turned on when using png_read_image Seemed harmless though; I didn't see any graphics missing. -- Antti Harri
[update] enigmail 1.2
Hi,
if you use rely on enigmail, please test this update, which targets
thunderbird 5.0 and seamonkey 2.2. It works in my light testing on
amd64. Check ports@ archive for the corresponding tb/sm updates.
If i don't hear from anyone, this will probably be commited this
weekend, along sm/tb.
Landry
Index: Makefile.inc
===
RCS file: /cvs/ports/mail/enigmail/Makefile.inc,v
retrieving revision 1.5
diff -u -r1.5 Makefile.inc
--- Makefile.inc26 Nov 2010 07:51:00 - 1.5
+++ Makefile.inc22 Jul 2011 05:15:39 -
@@ -15,11 +15,11 @@
MASTER_SITES = http://www.mozilla-enigmail.org/download/source/
-BUILD_DEPENDS =${MOZAPP_PKGPATH}:configure \
+BUILD_DEPENDS =${MOZAPP_PKGSTEM}:${MOZAPP_PKGPATH}:configure \
archivers/unzip
RUN_DEPENDS = security/gnupg
LIB_DEPENDS = ${MOZAPP_PKGPATH},-main
-WANTLIB = c m nspr4 plc4 plds4 stdc++ ${MOZAPP_DIR}/xpcom
${MOZAPP_DIR}/xpcom_core
+WANTLIB = c m nspr4 plc4 plds4 stdc++ ${MOZAPP_DIR}/xpcom
${MOZAPP_DIR}/xul ${MOZAPP_DIR}/mozalloc
USE_GMAKE =Yes
NO_REGRESS = Yes
@@ -37,23 +37,26 @@
SUBST_VARS = GUID
post-extract:
- @perl -pi -e 's|(genxpi.*) (\$$\(TARGET_XPCOM_ABI\))|\1 \2|g' \
+ # strip off the TARGET_XPCOM_ABI variable part
+ perl -pi -e 's|(genxpi.*) (\$$\(TARGET_XPCOM_ABI\))|\1 \2|g' \
${WRKDIST}/Makefile.in
- @perl -pi -e 's|[-_]?\$${xpcomAbi}||g' ${WRKDIST}/genxpi
- @mv ${WRKDIST} ${MOZBASE}/mailnews/extensions
+ # strip xpcomABI from platform and ABI in chrome.manifest
+ perl -pi -e 's|[-_]?\$${xpcomAbi}||g ; s| ABI=.\$${platform}.||g'
${WRKDIST}/genxpi
+ mv ${WRKDIST} ${MOZBASE}/mailnews/extensions
do-build:
- @cd ${MOZBASE} ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} export
- @cd ${MOZBASE}/mozilla/modules/libreg ${SETENV} ${MAKE_ENV}
${MAKE_PROGRAM}
- @cd ${MOZBASE}/mozilla/xpcom/string ${SETENV} ${MAKE_ENV}
${MAKE_PROGRAM}
- @cd ${MOZBASE}/mozilla/xpcom ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
- @cd ${MOZBASE}/mozilla/xpcom/obsolete ${SETENV} ${MAKE_ENV}
${MAKE_PROGRAM}
- @cd ${WRKSRC} ./makemake -r
- @cd ${WRKSRC} ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
- @cd ${WRKSRC} ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} xpi
+ cd ${MOZBASE}/mozilla ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} tier_base
+ cd ${MOZBASE}/mozilla ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} tier_js
+ cd ${MOZBASE}/mozilla ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
tier_platform
+ cd ${MOZBASE} ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} export
+ cd ${WRKSRC} ./makemake -r
+ # hax: switch to jar format to generate enigmail.jar
+ perl -pi -e 's|MOZ_CHROME_FILE_FORMAT.*|MOZ_CHROME_FILE_FORMAT=jar|'
${MOZBASE}/config/autoconf.mk
+ cd ${WRKSRC} ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+ cd ${WRKSRC} ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} xpi
do-install:
${INSTALL_DATA_DIR} ${GLOBALDIR}
unzip -q ${MOZBIN}/${ENIGMAIL_XPI} -d ${GLOBALDIR}
- cp ${GLOBALDIR}/platform/OpenBSD*/components/lib*.so.* \
- ${GLOBALDIR}/components/
+ # enigmail 1.2 works in seamonkey 2.2 so adjust install.rdf
+ perl -pi -e
's|em:maxVersion2.1.*/em:maxVersion|em:maxVersion2.2.*/em:maxVersion|'
${GLOBALDIR}/install.rdf
Index: seamonkey/Makefile
===
RCS file: /cvs/ports/mail/enigmail/seamonkey/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- seamonkey/Makefile 14 Jan 2011 22:58:49 - 1.4
+++ seamonkey/Makefile 22 Jul 2011 05:15:39 -
@@ -2,18 +2,19 @@
COMMENT = GnuPG extension for Seamonkey
-VERSION = 1.0.1
+VERSION = 1.2
PKGNAME = enigmail-seamonkey-${VERSION}
-REVISION = 4
# must be in sync with SO_VERSION in
# www/seamonkey
-SHARED_LIBS = enigmime16.1
+SHARED_LIBS = enigmime18.0 \
+ ipc 18.0
+MOZAPP_PKGSTEM = seamonkey-=2.2
MOZAPP_PKGPATH = www/seamonkey
-MOZAPP_DIR = seamonkey
-MOZAPP_BRANCH =1.9.1
+MOZAPP_DIR = lib/seamonkey-2.2
+MOZAPP_BRANCH =release
-ENIGMAIL_XPI= ${DISTNAME:S/.1//}-openbsd-${GNU_ARCH}.xpi
+ENIGMAIL_XPI = ${DISTNAME}-openbsd-${GNU_ARCH}.xpi
.include bsd.port.mk
Index: seamonkey/distinfo
===
RCS file: /cvs/ports/mail/enigmail/seamonkey/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- seamonkey/distinfo 27 Jul 2010 20:18:24 - 1.1.1.1
+++ seamonkey/distinfo 22 Jul 2011 05:15:39 -
@@ -1,5 +1,5 @@
-MD5 (enigmail-1.0.1.tar.gz) = UIypqwOWr7Segu2ogBSSSw==
-RMD160 (enigmail-1.0.1.tar.gz) = Kr2OcPz80udecal6Wjx9HgwpJmY=
-SHA1 (enigmail-1.0.1.tar.gz) = M05wcj//wGMdrbb9REmv/96vw/I=
-SHA256 (enigmail-1.0.1.tar.gz) =
