CVS: cvs.openbsd.org: ports

2014-01-11 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2014/01/11 01:35:15

Modified files:
mail/mozilla-thunderbird: Makefile 
Added files:
mail/mozilla-thunderbird/patches: 
  
patch-mailnews_base_search_src_nsMsgSearchTerm_cpp 

Log message:
Backport fix from bug #885538 to fix a build failure with clang 3.4 -
using an empty string instead of a null pointer only does a warning
with clang 3.3.

From brad



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Marc Espie
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2014/01/11 04:22:43

Modified files:
archivers/lzo  : Makefile 
archivers/lzo/pkg: PLIST 
audio/gsm  : Makefile 
audio/gsm/pkg  : PLIST 
audio/rplay: Makefile 
audio/rplay/pkg: PLIST 
graphics/libungif: Makefile 
graphics/libungif/pkg: PLIST 
print/pdflib   : Makefile 
print/pdflib/pkg: PLIST 

Log message:
scrape @endfake. I haven't been able to finish this in... ten years.
time to let it go.



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Marc Espie
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2014/01/11 04:43:16

Modified files:
www/drupal6/views: Makefile 
www/drupal6/views/pkg: PLIST 

Log message:
dead annotation



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2014/01/11 04:47:20

Modified files:
www/phantomjs  : Makefile 

Log message:
use DPB_PROPERTIES=nojunk, this has the usual problem with qmake where it
picks up installed headers even where they're not actually used



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Vadim Zhukov
CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2014/01/11 05:15:24

Modified files:
x11/kde/base3  : Makefile 
x11/kde/base3/pkg: DESCR-main DESCR-samba 
Added files:
x11/kde/base3/pkg: README-main 

Log message:
Small tweaks:
* zap extra whitespace in DESCR-*;
* move part of DESCR-main to README-main;
* remove stuff belonging to kde-shared-data (missed in previous commit).



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2014/01/11 05:45:37

Modified files:
x11/gnome/totem: Makefile 
x11/gnome/totem/pkg: PLIST 
Added files:
x11/gnome/totem/patches: patch-browser-plugin_totemPlugin_cpp 

Log message:
Enable browser plugins; it costs nothing dependency-wise and they are
actually usefull to play some contents.



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2014/01/11 05:56:41

Modified files:
devel/mingw: Makefile 
devel/mingw/pkg: README 
lang/tcl/8.5   : Makefile 
lang/tcl/8.5/pkg: README 
lang/tcl/8.6   : Makefile 
lang/tcl/8.6/pkg: README 
print/texlive/base: Makefile 
print/texlive/base/pkg: README 
www/sogo   : Makefile 
www/sogo/pkg   : README 

Log message:
Do not hardcode /usr/local.
Do not use SYSCONFDIR for base system etc files.



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Vadim Zhukov
CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2014/01/11 06:07:59

Modified files:
x11/kde/base3  : Makefile 
x11/kde/base3/pkg: README-main 

Log message:
Do not hardcode /usr/local in README, noted by ajacoutot@.



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2014/01/11 06:40:19

Modified files:
devel/p5-BSD-stat: Makefile distinfo 

Log message:
update p5-BSD-stat to 1.35



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2014/01/11 06:47:03

Modified files:
devel/p5-Data-Random: Makefile distinfo 

Log message:
update p5-Data-Random to 0.11



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2014/01/11 07:05:19

Modified files:
devel/p5-Data-Validate-IP: Makefile distinfo 

Log message:
update p5-Data-Validate-IP to 0.22



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2014/01/11 07:08:19

Modified files:
x11/gnome/totem/patches: patch-browser-plugin_totemPlugin_cpp 

Log message:
Committed upstream.



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2014/01/11 07:14:00

Modified files:
net/p5-Net-IMP : Makefile distinfo 

Log message:
update p5-Net-IMP to 0.627



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2014/01/11 07:39:46

Modified files:
security/yubikey-personalization-gui: Makefile distinfo 

Log message:
update to yubikey-personalization-gui-3.1.14, minor gui fix to confirmation box



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2014/01/11 08:00:23

Modified files:
editors/libreoffice: Makefile 

Log message:
default to no_java flavour on i386 for now (with an XXX comment); this
lets it package. much hair pulling involved until I worked out that no_java
is a flavour not a pseudo-flavour...



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2014/01/11 08:01:56

Modified files:
lang/php/5.3   : Makefile distinfo 
lang/php/5.3/patches: patch-ext_gd_config_m4 
  patch-ext_tidy_tidy_c 
Removed files:
lang/php/5.3/patches: patch-ext_openssl_openssl_c 

Log message:
update to php 5.3.28, fix CVE-2013-6420 memory corruption in openssl_x509_parse
(and roll in CVE patched locally). ok robert@



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2014/01/11 08:02:46

Modified files:
lang/php/5.4   : Makefile distinfo 
lang/php/5.4/patches: patch-php_ini-development 
  patch-php_ini-production 
Removed files:
lang/php/5.4/patches: patch-ext_gd_config_m4 

Log message:
update to php 5.4.24, various crash fixes, and CVE-2013-6420 memory corruption
in openssl_x509_parse.

remove local freetype patch, upstream now uses freetype-config.

ok robert@



CVS: cvs.openbsd.org: ports

2014-01-11 Thread David Coppa
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2014/01/11 09:04:43

Modified files:
x11/i3 : Makefile distinfo 
x11/i3/patches : patch-common_mk patch-i3-nagbar_main_c 
 patch-man_i3-dmenu-desktop_1 
 patch-man_i3-dump-log_1 
 patch-man_i3-migrate-config-to-v4_1 
 patch-src_commands_c patch-src_log_c 
 patch-src_startup_c 
Added files:
x11/i3/patches : patch-i3-config-wizard_main_c 
 patch-i3-input_main_c 
 patch-i3bar_include_util_h 
 patch-i3bar_src_main_c patch-i3bar_src_xcb_c 
 patch-include_libi3_h patch-include_log_h 
 patch-include_xcursor_h patch-libi3_font_c 
 patch-libi3_get_exe_path_c patch-src_floating_c 
 patch-src_xcursor_c 
Removed files:
x11/i3/patches : patch-include_window_h patch-include_x_h 
 patch-src_con_c patch-src_handlers_c 
 patch-src_manage_c patch-src_render_c 
 patch-src_tree_c patch-src_window_c 
 patch-src_x_c 

Log message:
Update to i3-4.7



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Vadim Zhukov
CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2014/01/11 09:42:01

Modified files:
infrastructure/bin: portcheck 

Log message:
Add checks for hardcoded /usr/local and /var in MESSAGE, DESCR, README and
UNMESSAGE files.



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2014/01/11 10:27:44

Modified files:
x11/gnome/gvfs : Makefile 
Added files:
x11/gnome/gvfs/patches: patch-daemon_pty_open_c 

Log message:
Prefer the openpty(3) code path over grantpt(3) -- this fixes the
numerous SSH dialogs when mount an sftp share (known_hosts additions and
password auth).



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2014/01/11 10:31:16

Modified files:
net/p5-Socket6 : Makefile distinfo 
net/p5-Socket6/pkg: PLIST 

Log message:
- update p5-Socket6 to 0.25
- indent Makefile
- CONFIGURE_ARGS not necessary, module uses perl cc and ccflags now
- install man page Socket6.3p



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2014/01/11 10:50:05

Modified files:
devel/py-gdata : Makefile distinfo 

Log message:
Update to py-gdata-2.0.18.

from frantisek holop (MAINTAINER)



CVS: cvs.openbsd.org: ports

2014-01-11 Thread David Coppa
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2014/01/11 11:45:53

Modified files:
www/youtube-dl : Makefile distinfo 
www/youtube-dl/pkg: PLIST 

Log message:
Update to 2014.01.08



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Edd Barrett
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2014/01/11 11:46:53

Modified files:
print/texlive  : Makefile.inc README 
print/texlive/base: Makefile distinfo 
print/texlive/base/patches: 

patch-texk_texlive_linked_scripts_installfont_installfont-tl 
print/texlive/base/pkg: PLIST README 
print/texlive/texmf: Makefile distinfo 
print/texlive/texmf/patches: 
 
patch-texmf-dist_tex_latex_beamer_beamerbaseverbatim_sty 
print/texlive/texmf/pkg: PLIST-context PLIST-docs PLIST-full 
 PLIST-main 
Added files:
print/texlive/base/patches: patch-texk_bibtex-x_Makefile_in 
patch-texk_chktex_chktex-1_7_1_deweb_in 
patch-texk_dvipdfmx_src_jpegimage_c 
patch-texk_dvipsk_bbox_c 
patch-texk_dvipsk_writet1_c 
patch-texk_mendexk_fwrite_c 

patch-texk_texlive_linked_scripts_a2ping_a2ping_pl 
patch-texk_web2c_luatexdir_font_writecff_w 
patch-texk_web2c_luatexdir_font_writettf_w 
patch-texk_web2c_luatexdir_pdf_pdfgen_w 
patch-texk_web2c_mplibdir_mp_w 
patch-texk_web2c_pdftexdir_ttf2afm_c 
patch-texk_web2c_pdftexdir_writettf_c 
print/texlive/texmf/patches: 
 patch-texmf-dist_doc_info_texdraw_info 
 patch-texmf-dist_web2c_texmf_cnf 
 patch-texmf-dist_web2c_texmfcnf_lua 
print/texlive/texmf/pkg: DESCR-buildset PLIST-buildset 
Removed files:
print/texlive/base/patches: patch-texk_texlive_context_mtxrun 
print/texlive/texmf/files/rblatter: mk_openbsd_plists.sh 
rblatter 
print/texlive/texmf/files/rblatter/lib: eqnparser.rb 
pkgfilter.rb 
pkgscanner.rb 
plistdeduper.rb 
spinner.rb subsetconf.rb 
subsetshaper.rb 
tlpdbindex.rb 
print/texlive/texmf/patches: patch-texmf_web2c_texmf_cnf 
 patch-texmf_web2c_texmfcnf_lua 

Log message:
Update to TeX Live 2013.

This incudes the new buildset texmf -- a smaller texmf tree used for
BUILD_DEPENDS. See the package README for more info on this.

OK espie@



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Edd Barrett
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2014/01/11 11:52:34

Modified files:
devel/darcs: Makefile 

Log message:
Use the new texlive buildset as a BUILD_DEPEND.

OK espie@



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Edd Barrett
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2014/01/11 11:53:34

Modified files:
textproc/dblatex: Makefile 

Log message:
Use the new texlive buildset as a BUILD_DEPEND.

OK espie@



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Brad Smith
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2014/01/11 12:19:43

Modified files:
audio/audacious: Makefile distinfo 
audio/audacious/pkg: PLIST 
audio/audacious-plugins: Makefile distinfo 
audio/audacious-plugins/pkg: PLIST 

Log message:
Update to Audacious 3.4.3.

ok dcoppa@ shadchin@



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Brad Smith
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2014/01/11 12:28:41

Modified files:
databases/mariadb: Makefile distinfo 
databases/mariadb/patches: patch-client_CMakeLists_txt 
   patch-libmysql_CMakeLists_txt 
   patch-scripts_mysql_install_db_sh 
   patch-sql_CMakeLists_txt 
   patch-sql_mysqld_cc 
   patch-storage_oqgraph_CMakeLists_txt 
databases/mariadb/pkg: PLIST-main PLIST-server PLIST-tests 
Removed files:
databases/mariadb/patches: patch-mysql-test_CMakeLists_txt 

Log message:
Update to MariaDB 10.0.7. This is the last beta release and it is
feature complete; the next release will be RC and then a GA.

ok sthen@



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Matthias Kilian
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2014/01/11 13:22:21

Modified files:
lang/ghc   : ghc.port.mk 

Log message:
Interactive ghc (ghci, runghc etc.) is currently broken again on i386.
So let's switch to compiling Setup scripts once more, to give at least
a few more hs packages to be built on i386, until I figure out a fix
for rts/Linker.c.
Unfortunately, the current breakage also affects template haskell,
which still leads to a lot of unbuildable ports, for example
devel/hs-vector.



CVS: cvs.openbsd.org: ports

2014-01-11 Thread David Coppa
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2014/01/11 14:15:26

Modified files:
x11/mlterm : Makefile distinfo 
x11/mlterm/patches: patch-configure_in 
patch-xwindow_fb_x_display_c 
patch-xwindow_fb_x_h 
patch-xwindow_x_screen_c 
patch-xwindow_xlib_x_window_c 
Added files:
x11/mlterm/patches: patch-xwindow_fb_x_display_wscons_c 
Removed files:
x11/mlterm/patches: patch-xwindow_fb_x_window_c 

Log message:
Update to mlterm-3.3.2 + aoyama@'s patch to add support for
OpenBSD/luna88k 8bpp framebuffer
(https://bitbucket.org/arakiken/mlterm/commits/2b4b80e883a654bc1b5ad7756843e28750ee6f37)



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2014/01/11 15:29:31

Modified files:
lang/ruby/2.1  : Makefile 
Added files:
lang/ruby/2.1/patches: patch-lib_rubygems_rb 

Log message:
Make gem extension directory not include ruby tiny version, to avoid
issues when updating to 2.1.1.



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2014/01/11 15:33:50

Modified files:
lang/ruby  : ruby.port.mk 
Added files:
lang/ruby  : rubygems-ext.PLIST 

Log message:
Support building ruby 2.1 packages for gem/extconf ports using the
ruby21 FLAVOR.  Use additional PLIST file for gems with C extensions
for ruby 2.1, to include the gem.build_complete file, which avoids
problems where rubygems attempts to build extensions at runtime.



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2014/01/11 15:37:44

Modified files:
devel/jdk/1.6  : Makefile 

Log message:
additional comment reminding to switch libreoffice back if jdk is fixed



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2014/01/11 15:37:42

Modified files:
databases/ruby-swift: Makefile 

Log message:
Allow building with ruby21 FLAVOR, remove default setting of FLAVOR
to ruby19.



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2014/01/11 15:42:26

Modified files:
databases/ruby-swift-db-mysql: Makefile 
databases/ruby-swift-db-mysql/pkg: PLIST 
databases/ruby-swift-db-postgres: Makefile 
databases/ruby-swift-db-postgres/pkg: PLIST 
databases/ruby-swift-db-sqlite3: Makefile 
databases/ruby-swift-db-sqlite3/pkg: PLIST 
Added files:
databases/ruby-swift-db-mysql/patches: 
   patch-lib_swift_db_mysql_rb 
databases/ruby-swift-db-postgres/patches: 
  
patch-lib_swift_db_postgres_rb 
databases/ruby-swift-db-sqlite3/patches: 
 patch-lib_swift_db_sqlite3_rb 

Log message:
Allow building with ruby21 FLAVOR, remove default setting of FLAVOR
to ruby19.  Remove extension source directory from package and fix
require for extension file, since it previously depended on the copy
in the extension source directory.



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2014/01/11 15:45:52

Modified files:
textproc/ruby-hyperestraier: Makefile 

Log message:
Support building with ruby21 FLAVOR.



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2014/01/11 15:51:03

Modified files:
audio/ruby-id3lib: Makefile 
audio/ruby-id3lib/pkg: PLIST 
audio/ruby-vorbis_comment: Makefile 
audio/ruby-vorbis_comment/pkg: PLIST 
converters/ruby-json: Makefile 
converters/ruby-json/pkg: PLIST 
databases/ruby-amalgalite: Makefile 
databases/ruby-amalgalite/pkg: PLIST 
databases/ruby-do_mysql: Makefile 
databases/ruby-do_mysql/pkg: PLIST 
databases/ruby-do_postgres: Makefile 
databases/ruby-do_postgres/pkg: PLIST 
databases/ruby-do_sqlite3: Makefile 
databases/ruby-do_sqlite3/pkg: PLIST 
databases/ruby-ldap: Makefile 
databases/ruby-ldap/pkg: PLIST 
databases/ruby-mysql: Makefile 
databases/ruby-mysql/pkg: PLIST 
databases/ruby-mysql2: Makefile 
databases/ruby-mysql2/pkg: PLIST 
databases/ruby-pg: Makefile 
databases/ruby-pg/pkg: PLIST 
databases/ruby-sequel_pg: Makefile 
databases/ruby-sequel_pg/pkg: PLIST 
databases/ruby-sqlite3: Makefile 
databases/ruby-sqlite3/pkg: PLIST 
databases/ruby-tiny_tds: Makefile 
databases/ruby-tiny_tds/pkg: PLIST 
devel/ruby-kgio: Makefile 
devel/ruby-kgio/pkg: PLIST 
devel/ruby-narray: Makefile 
devel/ruby-narray/pkg: PLIST 
devel/ruby-ncurses: Makefile 
devel/ruby-ncurses/pkg: PLIST 
devel/ruby-subset_sum: Makefile 
devel/ruby-subset_sum/pkg: PLIST 
devel/ruby-therubyracer: Makefile 
devel/ruby-therubyracer/pkg: PLIST 
devel/ruby-yajl: Makefile 
devel/ruby-yajl/pkg: PLIST 
graphics/ruby-rmagick: Makefile 
graphics/ruby-rmagick/pkg: PLIST 
net/ruby-eventmachine: Makefile 
net/ruby-eventmachine/pkg: PLIST 
security/ruby-bcrypt: Makefile 
security/ruby-bcrypt/pkg: PLIST 
sysutils/ruby-augeas: Makefile 
sysutils/ruby-augeas/pkg: PLIST 
sysutils/ruby-libvirt: Makefile 
sysutils/ruby-libvirt/pkg: PLIST 
sysutils/ruby-posix-spawn: Makefile 
sysutils/ruby-posix-spawn/pkg: PLIST 
textproc/ruby-fast-stemmer: Makefile 
textproc/ruby-fast-stemmer/pkg: PLIST 
textproc/ruby-hpricot: Makefile 
textproc/ruby-hpricot/pkg: PLIST 
textproc/ruby-nokogiri: Makefile 
textproc/ruby-nokogiri/pkg: PLIST 
textproc/ruby-rdiscount: Makefile 
textproc/ruby-rdiscount/pkg: PLIST 
textproc/ruby-redcarpet: Makefile 
textproc/ruby-redcarpet/pkg: PLIST 
textproc/ruby-redcloth: Makefile 
textproc/ruby-redcloth/pkg: PLIST 
www/ruby-capybara-webkit: Makefile 
www/ruby-capybara-webkit/pkg: PLIST 
www/ruby-fcgi  : Makefile 
www/ruby-fcgi/pkg: PLIST 
www/ruby-raindrops: Makefile 
www/ruby-raindrops/pkg: PLIST 
www/ruby-thin  : Makefile 
www/ruby-thin/pkg: PLIST 
www/ruby-unicorn: Makefile 
www/ruby-unicorn/pkg: PLIST 

Log message:
Remove extension source directory from package so that ruby21 FLAVOR
packages.



CVS: cvs.openbsd.org: ports

2014-01-11 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2014/01/11 15:56:04

Modified files:
audio  : Makefile 
converters : Makefile 
devel  : Makefile 
databases  : Makefile 
graphics   : Makefile 
net: Makefile 
security   : Makefile 
sysutils   : Makefile 
textproc   : Makefile 
www: Makefile 

Log message:
Build ruby21-* packages for ruby gem ports with C extensions.



Re: MPlayer - Build on x86 with Clang for ASM

2014-01-11 Thread Jan Stary
On Jan 10 19:13:39, b...@comstyle.com wrote:
 Here is a diff to have MPlayer build using Clang to take advantage
 of the integrated assembler to be able to build the SSSE3 / SSE4
 support.
 
 Note: has not been checked on i386, please someone try building this
 and see if it does. *crosses fingers*

===  Configuring for mplayer-20140106p0
Checking for cc version ... clang 4.2.1 (experimental support only)
Checking for working compiler ... yes
Detected operating system: OpenBSD
Detected host architecture: i386
Checking for cross compilation ... no
Checking for host cc ... cc
Checking for GCC  CPU optimization abilities ... i386
Checking for byte order ... little-endian
Checking for extern symbol prefix ...
Checking for assembler support of -pipe option ... yes
Checking for relocatable binary ... no
Checking for assembler (/usr/bin/as 2.15) ... failed (Upgrade binutils to 
2.16.92 or use --disable-ssse3 etc.)

Error: obsolete binutils version

Check config.log if you do not understand why it failed.
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2650 
'/usr/ports/pobj/mplayer-20140106/.configure_done')
*** Error 1 in /usr/ports/x11/mplayer 
(/usr/ports/infrastructure/mk/bsd.port.mk:2406 'all')


This is today's snapshot of i386. Indeed,

$ as --version
GNU assembler 2.15


Am I missing something?


 Index: Makefile
 ===
 RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
 retrieving revision 1.231
 diff -u -p -u -p -r1.231 Makefile
 --- Makefile  10 Jan 2014 21:52:29 -  1.231
 +++ Makefile  10 Jan 2014 23:58:16 -
 @@ -15,6 +15,7 @@ SUBST_VARS +=   PREFIX CONFDIR
  # Distfiles must be hand-rolled, see README
  N =  mplayer
  DISTNAME =   mplayer-${V}
 +REVISION =   0
  EXTRACT_SUFX =   .tar.xz
  
  CATEGORIES = x11 multimedia
 @@ -37,7 +38,8 @@ MASTER_SITES =  http://comstyle.com/sourc
  
  MAINTAINER = Edd Barrett e...@openbsd.org
  
 -MODULES +=   converters/libiconv
 +MODULES +=   converters/libiconv \
 + lang/clang
  
  LIB_DEPENDS =graphics/png \
   graphics/jpeg \
 @@ -71,6 +73,9 @@ BUILD_DEPENDS +=graphics/ffmpeg:patch
  BUILD_DEPENDS += devel/yasm
  .endif
  
 +MODCLANG_ARCHS=  amd64 i386
 +MODCLANG_LANGS=  c
 +
  CONFDIR =${SYSCONFDIR}/mplayer
  
  .if ${MACHINE_ARCH:Marm}
 @@ -164,11 +169,8 @@ WANTLIB +=   vorbisenc vorbis
  
  CONFIGURE_ENV += LOCALBASE=${LOCALBASE} TMPDIR=${WRKBUILD}
  
 -# binutils 2.15 does not support SSSE3 / SSE4 for amd64 / i386
  .if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
  CONFIGURE_ARGS += --enable-runtime-cpudetection
 -CONFIGURE_ARGS += --disable-ssse3
 -CONFIGURE_ARGS += --disable-sse4
  .endif
  
  # binutils 2.15 assembler missing opcode support



Re: MPlayer - Build on x86 with Clang for ASM

2014-01-11 Thread Jan Stary
On Jan 11 09:55:30, h...@stare.cz wrote:
 On Jan 10 19:13:39, b...@comstyle.com wrote:
  Here is a diff to have MPlayer build using Clang to take advantage
  of the integrated assembler to be able to build the SSSE3 / SSE4
  support.
  
  Note: has not been checked on i386, please someone try building this
  and see if it does. *crosses fingers*
 
 ===  Configuring for mplayer-20140106p0
 Checking for cc version ... clang 4.2.1 (experimental support only)
 Checking for working compiler ... yes
 Detected operating system: OpenBSD
 Detected host architecture: i386
 Checking for cross compilation ... no
 Checking for host cc ... cc
 Checking for GCC  CPU optimization abilities ... i386
 Checking for byte order ... little-endian
 Checking for extern symbol prefix ...
 Checking for assembler support of -pipe option ... yes
 Checking for relocatable binary ... no
 Checking for assembler (/usr/bin/as 2.15) ... failed (Upgrade binutils to 
 2.16.92 or use --disable-ssse3 etc.)
 
 Error: obsolete binutils version
 
 Check config.log if you do not understand why it failed.
 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2650 
 '/usr/ports/pobj/mplayer-20140106/.configure_done')
 *** Error 1 in /usr/ports/x11/mplayer 
 (/usr/ports/infrastructure/mk/bsd.port.mk:2406 'all')

[...]
 Checking for assembler (/usr/bin/as 2.15) 
Result is: failed (Upgrade binutils to 2.16.92 or use --disable-ssse3 etc.)
##


 
 This is today's snapshot of i386. Indeed,
 
 $ as --version
 GNU assembler 2.15
 
 
 Am I missing something?
 
 
  Index: Makefile
  ===
  RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
  retrieving revision 1.231
  diff -u -p -u -p -r1.231 Makefile
  --- Makefile10 Jan 2014 21:52:29 -  1.231
  +++ Makefile10 Jan 2014 23:58:16 -
  @@ -15,6 +15,7 @@ SUBST_VARS += PREFIX CONFDIR
   # Distfiles must be hand-rolled, see README
   N =mplayer
   DISTNAME = mplayer-${V}
  +REVISION = 0
   EXTRACT_SUFX = .tar.xz
   
   CATEGORIES =   x11 multimedia
  @@ -37,7 +38,8 @@ MASTER_SITES =http://comstyle.com/sourc
   
   MAINTAINER =   Edd Barrett e...@openbsd.org
   
  -MODULES += converters/libiconv
  +MODULES += converters/libiconv \
  +   lang/clang
   
   LIB_DEPENDS =  graphics/png \
  graphics/jpeg \
  @@ -71,6 +73,9 @@ BUILD_DEPENDS +=graphics/ffmpeg:patch
   BUILD_DEPENDS += devel/yasm
   .endif
   
  +MODCLANG_ARCHS=amd64 i386
  +MODCLANG_LANGS=c
  +
   CONFDIR =  ${SYSCONFDIR}/mplayer
   
   .if ${MACHINE_ARCH:Marm}
  @@ -164,11 +169,8 @@ WANTLIB += vorbisenc vorbis
   
   CONFIGURE_ENV += LOCALBASE=${LOCALBASE} TMPDIR=${WRKBUILD}
   
  -# binutils 2.15 does not support SSSE3 / SSE4 for amd64 / i386
   .if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
   CONFIGURE_ARGS += --enable-runtime-cpudetection
  -CONFIGURE_ARGS += --disable-ssse3
  -CONFIGURE_ARGS += --disable-sse4
   .endif
   
   # binutils 2.15 assembler missing opcode support



Re: MPlayer - Build on x86 with Clang for ASM

2014-01-11 Thread Stuart Henderson
On 2014/01/10 19:13, Brad Smith wrote:
 Here is a diff to have MPlayer build using Clang to take advantage
 of the integrated assembler to be able to build the SSSE3 / SSE4
 support.
 
 Note: has not been checked on i386, please someone try building this
 and see if it does. *crosses fingers*

It builds on i386 with the following diff (which hacks out the configure
test), but it's on a remote machine so I can't test runtime. (Note that
-fomit-frame-pointer is still needed even though afaik clang is not doing
pie by default).

i386 package at http://junkpile.org/mplayer-20130819p2.tgz if anyone
would like to test it without having to build.


Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.231
diff -u -p -r1.231 Makefile
--- Makefile10 Jan 2014 21:52:29 -  1.231
+++ Makefile11 Jan 2014 12:01:38 -
@@ -15,6 +15,7 @@ SUBST_VARS += PREFIX CONFDIR
 # Distfiles must be hand-rolled, see README
 N =mplayer
 DISTNAME = mplayer-${V}
+REVISION = 0
 EXTRACT_SUFX = .tar.xz
 
 CATEGORIES =   x11 multimedia
@@ -37,7 +38,8 @@ MASTER_SITES =http://comstyle.com/sourc
 
 MAINTAINER =   Edd Barrett e...@openbsd.org
 
-MODULES += converters/libiconv
+MODULES += converters/libiconv \
+   lang/clang
 
 LIB_DEPENDS =  graphics/png \
graphics/jpeg \
@@ -71,6 +73,9 @@ BUILD_DEPENDS +=graphics/ffmpeg:patch
 BUILD_DEPENDS += devel/yasm
 .endif
 
+MODCLANG_ARCHS=amd64 i386
+MODCLANG_LANGS=c
+
 CONFDIR =  ${SYSCONFDIR}/mplayer
 
 .if ${MACHINE_ARCH:Marm}
@@ -164,11 +169,8 @@ WANTLIB += vorbisenc vorbis
 
 CONFIGURE_ENV += LOCALBASE=${LOCALBASE} TMPDIR=${WRKBUILD}
 
-# binutils 2.15 does not support SSSE3 / SSE4 for amd64 / i386
 .if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
 CONFIGURE_ARGS += --enable-runtime-cpudetection
-CONFIGURE_ARGS += --disable-ssse3
-CONFIGURE_ARGS += --disable-sse4
 .endif
 
 # binutils 2.15 assembler missing opcode support
Index: patches/patch-configure
===
RCS file: /cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.73
diff -u -p -r1.73 patch-configure
--- patches/patch-configure 10 Jan 2014 21:52:29 -  1.73
+++ patches/patch-configure 11 Jan 2014 13:35:10 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-configure,v 1.73 2014/01/10 21:52:29 brad Exp $
 configure.orig Mon Jan  6 17:03:04 2014
-+++ configure  Mon Jan  6 17:22:43 2014
+--- configure.orig Mon Jan  6 15:03:04 2014
 configure  Sat Jan 11 05:08:34 2014
 @@ -1497,36 +1497,36 @@ echo configuration: $configuration  $TMPLOG
  echo  $TMPLOG
  
@@ -85,6 +85,15 @@ $OpenBSD: patch-configure,v 1.73 2014/01
  extern_prefix=${sym%%ff_extern*}
  def_extern_asm=#define EXTERN_ASM $extern_prefix
  def_extern_prefix=#define EXTERN_PREFIX \$extern_prefix\
+@@ -2820,7 +2820,7 @@ elif test $relocatable = yes ; then
+ fi
+ echores $relocatable
+ 
+-if x86_32 ; then
++if 0; then # x86_32
+   # Checking assembler (_as) compatibility...
+   # Added workaround for older as that reads from stdin by default - atmos
+   as_version=$(echo '' | $_as -version 21 | sed -n 's/^.*assembler 
\(version \)*\([0-9.]*\).*$/\2/p')
 @@ -6153,7 +6153,7 @@ echocheck cdparanoia
  if test $_cdparanoia = auto ; then
  _cdparanoia=no



Re: MPlayer - Build on x86 with Clang for ASM

2014-01-11 Thread Stuart Henderson
On 2014/01/11 13:49, Stuart Henderson wrote:
 i386 package at http://junkpile.org/mplayer-20130819p2.tgz if anyone
 would like to test it without having to build.

bleh, wrong package, it will be at http://junkpile.org/mplayer-20140106p0.tgz 
shortly.



php 5.3.28, 5.4.24

2014-01-11 Thread Stuart Henderson
This fixes various crashes, and CVE-2013-6420 memory corruption in
openssl_x509_parse.

In 5.4, upstream now use freetype-config for the check in
ext/gd/config.m4 so the recently-added local patch for new freetype
isn't needed.

OK?

Index: 5.3/Makefile
===
RCS file: /cvs/ports/lang/php/5.3/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- 5.3/Makefile18 Oct 2013 20:20:29 -  1.68
+++ 5.3/Makefile11 Jan 2014 14:50:05 -
@@ -7,7 +7,7 @@ BROKEN-hppa =   no __sync_bool_compare_and
 USE_LIBTOOL=   No
 
 PV=5.3
-V= ${PV}.27
+V= ${PV}.28
 SUHOSIN_PHPV=  5.3.24
 SUHOSIN_P_V=   0.9.10unofficial
 REVISION=  0
Index: 5.3/distinfo
===
RCS file: /cvs/ports/lang/php/5.3/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- 5.3/distinfo16 Jul 2013 08:49:09 -  1.25
+++ 5.3/distinfo11 Jan 2014 14:50:05 -
@@ -1,6 +1,6 @@
-SHA256 (php-5.3.27.tar.bz2) = 4S2yHGI7gqIkTE3ZsGu3WvIIaMG3SKEFpoKaWsw2soc=
+SHA256 (php-5.3.28.tar.bz2) = DKyWDGUcT7s9Ic8vKyeaBuIZSPs1oNFDm5cpbKwdhRM=
 SHA256 (suhosin-0.9.33.tgz) = hlsccrrppacQ/gsHoGNVVs5sg4ZT7DZNKipub1lFKcU=
 SHA256 (suhosin-patch-5.3.24-0.9.10unofficial.patch.gz) = 
U5BzS4ifZwScY5NxpuUmojTzjNxNKj89msv0ov5PGmQ=
-SIZE (php-5.3.27.tar.bz2) = 11432791
+SIZE (php-5.3.28.tar.bz2) = 11051714
 SIZE (suhosin-0.9.33.tgz) = 104488
 SIZE (suhosin-patch-5.3.24-0.9.10unofficial.patch.gz) = 41586
Index: 5.3/patches/patch-ext_gd_config_m4
===
RCS file: /cvs/ports/lang/php/5.3/patches/patch-ext_gd_config_m4,v
retrieving revision 1.7
diff -u -p -r1.7 patch-ext_gd_config_m4
--- 5.3/patches/patch-ext_gd_config_m4  9 Jan 2014 19:51:04 -   1.7
+++ 5.3/patches/patch-ext_gd_config_m4  11 Jan 2014 14:50:05 -
@@ -1,6 +1,7 @@
 ext/gd/config.m4.orig  Wed Jan  8 22:17:54 2014
-+++ ext/gd/config.m4   Wed Jan  8 22:18:11 2014
-@@ -162,7 +162,7 @@
+$OpenBSD$
+--- ext/gd/config.m4.orig.port Tue Dec 10 19:04:57 2013
 ext/gd/config.m4   Sat Jan 11 14:26:07 2014
+@@ -162,7 +162,7 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
if test $PHP_FREETYPE_DIR != no; then
  
  for i in $PHP_FREETYPE_DIR /usr/local /usr; do
Index: 5.3/patches/patch-ext_openssl_openssl_c
===
RCS file: 5.3/patches/patch-ext_openssl_openssl_c
diff -N 5.3/patches/patch-ext_openssl_openssl_c
--- 5.3/patches/patch-ext_openssl_openssl_c 23 Aug 2013 10:06:45 -  
1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,116 +0,0 @@
-Security fix for CVE-2013-4073
-
-http://git.php.net/?p=php-src.git;a=commit;h=2874696a5a8d46639d261571f915c493cd875897
-http://git.php.net/?p=php-src.git;a=commit;h=b7f033bd5de844e7cf0f1f7c2b884d582d4aa847
-
-$OpenBSD: patch-ext_openssl_openssl_c,v 1.2 2013/08/23 10:06:45 sthen Exp $
 ext/openssl/openssl.c.orig.portWed Jul 10 19:43:08 2013
-+++ ext/openssl/openssl.c  Thu Aug 22 22:37:08 2013
-@@ -1326,6 +1326,74 @@ PHP_FUNCTION(openssl_x509_check_private_key)
- }
- /* }}} */
- 
-+/* Special handling of subjectAltName, see CVE-2013-4073
-+ * Christian Heimes
-+ */
-+
-+static int openssl_x509v3_subjectAltName(BIO *bio, X509_EXTENSION *extension)
-+{
-+  GENERAL_NAMES *names;
-+  const X509V3_EXT_METHOD *method = NULL;
-+  long i, length, num;
-+  const unsigned char *p;
-+
-+  method = X509V3_EXT_get(extension);
-+  if (method == NULL) {
-+  return -1;
-+  }
-+
-+  p = extension-value-data;
-+  length = extension-value-length;
-+  if (method-it) {
-+  names = (GENERAL_NAMES*)(ASN1_item_d2i(NULL, p, length,
-+ 
ASN1_ITEM_ptr(method-it)));
-+  } else {
-+  names = (GENERAL_NAMES*)(method-d2i(NULL, p, length));
-+  }
-+  if (names == NULL) {
-+  return -1;
-+  }
-+
-+  num = sk_GENERAL_NAME_num(names);
-+  for (i = 0; i  num; i++) {
-+  GENERAL_NAME *name;
-+  ASN1_STRING *as;
-+  name = sk_GENERAL_NAME_value(names, i);
-+  switch (name-type) {
-+  case GEN_EMAIL:
-+  BIO_puts(bio, email:);
-+  as = name-d.rfc822Name;
-+  BIO_write(bio, ASN1_STRING_data(as),
-+ASN1_STRING_length(as));
-+  break;
-+  case GEN_DNS:
-+  BIO_puts(bio, DNS:);
-+  as = name-d.dNSName;
-+  BIO_write(bio, ASN1_STRING_data(as),
-+  

Re: [update] py-gdata

2014-01-11 Thread frantisek holop
ping?

hmm, on Sat, Dec 28, 2013 at 05:49:54PM +0100, frantisek holop said that
 another try for this easy update.
 please test and commit.
 
 -f
 -- 
 reach out /usr/bin/touch faith

 Index: Makefile
 ===
 RCS file: /cvs/ports/devel/py-gdata/Makefile,v
 retrieving revision 1.18
 diff -u -p -r1.18 Makefile
 --- Makefile  7 Aug 2013 21:31:42 -   1.18
 +++ Makefile  28 Dec 2013 16:45:07 -
 @@ -2,10 +2,9 @@
  
  COMMENT =Python client library for Google data APIs
  
 -MODPY_EGG_VERSION = 2.0.17
 +MODPY_EGG_VERSION = 2.0.18
  DISTNAME =   gdata-${MODPY_EGG_VERSION}
  PKGNAME =py-gdata-${MODPY_EGG_VERSION}
 -REVISION =   0
  CATEGORIES = devel
  
  HOMEPAGE =   https://code.google.com/p/gdata-python-client/
 Index: distinfo
 ===
 RCS file: /cvs/ports/devel/py-gdata/distinfo,v
 retrieving revision 1.10
 diff -u -p -r1.10 distinfo
 --- distinfo  16 Jul 2012 13:15:05 -  1.10
 +++ distinfo  28 Dec 2013 16:45:07 -
 @@ -1,2 +1,2 @@
 -SHA256 (gdata-2.0.17.tar.gz) = rXInRTLXJjBHM8W/wBv/q4x6NM5+cw3u2Emuy2LFqi0=
 -SIZE (gdata-2.0.17.tar.gz) = 2398047
 +SHA256 (gdata-2.0.18.tar.gz) = VufSLegZwisTzrD+GGlym0KH+J671LtVOA17z2Gh/bY=
 +SIZE (gdata-2.0.18.tar.gz) = 2475552


-- 
nobody can be exactly like me.  even i have trouble doing so.



Re: [update] py-gdata

2014-01-11 Thread Antoine Jacoutot
On Sat, Jan 11, 2014 at 06:45:58PM +0100, frantisek holop wrote:
 ping?

Committed, thanks.

 
 hmm, on Sat, Dec 28, 2013 at 05:49:54PM +0100, frantisek holop said that
  another try for this easy update.
  please test and commit.
  
  -f
  -- 
  reach out /usr/bin/touch faith
 
  Index: Makefile
  ===
  RCS file: /cvs/ports/devel/py-gdata/Makefile,v
  retrieving revision 1.18
  diff -u -p -r1.18 Makefile
  --- Makefile7 Aug 2013 21:31:42 -   1.18
  +++ Makefile28 Dec 2013 16:45:07 -
  @@ -2,10 +2,9 @@
   
   COMMENT =  Python client library for Google data APIs
   
  -MODPY_EGG_VERSION = 2.0.17
  +MODPY_EGG_VERSION = 2.0.18
   DISTNAME = gdata-${MODPY_EGG_VERSION}
   PKGNAME =  py-gdata-${MODPY_EGG_VERSION}
  -REVISION = 0
   CATEGORIES =   devel
   
   HOMEPAGE = https://code.google.com/p/gdata-python-client/
  Index: distinfo
  ===
  RCS file: /cvs/ports/devel/py-gdata/distinfo,v
  retrieving revision 1.10
  diff -u -p -r1.10 distinfo
  --- distinfo16 Jul 2012 13:15:05 -  1.10
  +++ distinfo28 Dec 2013 16:45:07 -
  @@ -1,2 +1,2 @@
  -SHA256 (gdata-2.0.17.tar.gz) = rXInRTLXJjBHM8W/wBv/q4x6NM5+cw3u2Emuy2LFqi0=
  -SIZE (gdata-2.0.17.tar.gz) = 2398047
  +SHA256 (gdata-2.0.18.tar.gz) = VufSLegZwisTzrD+GGlym0KH+J671LtVOA17z2Gh/bY=
  +SIZE (gdata-2.0.18.tar.gz) = 2475552
 
 
 -- 
 nobody can be exactly like me.  even i have trouble doing so.
 

-- 
Antoine



[new] mpv 0.3.2

2014-01-11 Thread frantisek holop
this is a new update for mpv the player based on
mplayer.

changes from 0.2.4:
-build system switched to waf. as the waf port is uphill
battle and i dont feel strongly about it, this port
goes around that dependency using SUPDISTFILES

i think this player is much nice than mplayer, if you
are a regular mplayer user (like i was) give this one a
chance.

-f
-- 
call it fate, call it luck, call me beautiful.


mpv-0.3.2.tar.gz
Description: application/tar-gz


Re: [update] py-simplejson

2014-01-11 Thread frantisek holop
after some soul searching (and googling), i actually
cannot come up with a good reason why this package is
needed...  it is included in 2.7 if i read the docs
correctly.  perhaps it should go to the attic.

-f

hmm, on Tue, Dec 31, 2013 at 10:01:34AM -0500, Eric Radman said that
 On Sun, Dec 29, 2013 at 12:18:28PM +0100, frantisek holop wrote:
  hmm, on Sat, Dec 28, 2013 at 11:54:28PM -0800, Martynas Venckus said that
   The diff looks good but I don't use this anymore, so could you remove
   me as maintainer and find someone to take care of testing/committing
   it?
  
  ok, i take over.  attached the new version.
  please test and commit.
  
  -f
  -- 
  i'm here to question all your answers.
 
  Index: Makefile
  ===
  RCS file: /cvs/ports/devel/py-simplejson/Makefile,v
  retrieving revision 1.19
  diff -u -p -r1.19 Makefile
  --- Makefile11 Mar 2013 10:50:26 -  1.19
  +++ Makefile29 Dec 2013 11:16:55 -
  @@ -2,15 +2,14 @@
   
   COMMENT =  JSON encoder/decoder
   
  -MODPY_EGG_VERSION =2.5.0
  +MODPY_EGG_VERSION =3.3.1
 
 simplejson is listed as a dependency for several ports, but are they
 using it?  It has been bundled with Python since 2.6.  Projects that
 still support Python 2.5 will typically do include some logic that tries
 to import the standard library first
 
 try:
 import json
 except ImportError:
 import simplejson as json

-- 
so you think you can tell heaven from hell.



Re: MPlayer - Build on x86 with Clang for ASM

2014-01-11 Thread Brad Smith

On 11/01/14 8:49 AM, Stuart Henderson wrote:

On 2014/01/10 19:13, Brad Smith wrote:

Here is a diff to have MPlayer build using Clang to take advantage
of the integrated assembler to be able to build the SSSE3 / SSE4
support.

Note: has not been checked on i386, please someone try building this
and see if it does. *crosses fingers*


It builds on i386 with the following diff (which hacks out the configure
test), but it's on a remote machine so I can't test runtime. (Note that
-fomit-frame-pointer is still needed even though afaik clang is not doing
pie by default).


Thanks. The updated diff looks right. Also Clang *does* use PIE by 
default. .. which reminds me of something else.



i386 package at http://junkpile.org/mplayer-20130819p2.tgz if anyone
would like to test it without having to build.


Please test.

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.



UPDATE: GCC 4.6 / 4.8 -- PIE fixes

2014-01-11 Thread Brad Smith
Here is a diff to enable PIE by default with the GCC 4.6 / 4.8 ports,
but while there I noticed alpha was missed for 4.6 and 4.8 has PIE
enabled for powerpc but PIE support hasn't been enabled by default
yet so disable it for now.

Stuart, please check this and put it into a bulk build.


Index: 4.6/Makefile
===
RCS file: /home/cvs/ports/lang/gcc/4.6/Makefile,v
retrieving revision 1.66
diff -u -p -u -p -r1.66 Makefile
--- 4.6/Makefile25 Nov 2013 14:16:23 -  1.66
+++ 4.6/Makefile11 Jan 2014 19:26:44 -
@@ -24,14 +24,14 @@ PKGNAME-ada =   gnat-${FULL_PKGVERSION}
 PKGNAME-go =   gccgo-${FULL_PKGVERSION}
 PKGSPEC-main = gcc-=4.6,4.7
 
-REVISION-main =4
-REVISION-c++ = 1
-#REVISION-estdc =
-REVISION-f95 = 1
-REVISION-java =1
-REVISION-objc =0
-REVISION-ada = 3
-REVISION-go =  1
+REVISION-main =5
+REVISION-c++ = 2
+REVISION-estdc = 0
+REVISION-f95 = 2
+REVISION-java =2
+REVISION-objc =1
+REVISION-ada = 4
+REVISION-go =  2
 
 SHARED_LIBS =  estdc++ 14.0 \
gfortran3.0 \
Index: 4.6/patches/patch-gcc_config_gcc
===
RCS file: /home/cvs/ports/lang/gcc/4.6/patches/patch-gcc_config_gcc,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-gcc_config_gcc
--- 4.6/patches/patch-gcc_config_gcc7 Jun 2013 07:54:23 -   1.7
+++ 4.6/patches/patch-gcc_config_gcc11 Jan 2014 19:43:36 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-gcc_config_gcc,v 1.7 2013/06/07 07:54:23 pascal Exp $
 gcc/config.gcc.origWed Mar  6 18:40:07 2013
-+++ gcc/config.gcc Sat Apr 13 16:20:31 2013
+--- gcc/config.gcc.origWed Mar  6 12:40:07 2013
 gcc/config.gcc Sat Jan 11 14:42:08 2014
 @@ -668,6 +668,14 @@ case ${target} in
  *-*-openbsd2.*|*-*-openbsd3.[012])
tm_defines=${tm_defines} HAS_LIBC_R=1 ;;
@@ -16,6 +16,15 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
;;
  *-*-rtems*)
case ${enable_threads} in
+@@ -741,7 +749,7 @@ alpha*-*-netbsd*)
+   tmake_file=${tmake_file} alpha/t-alpha alpha/t-ieee
+   ;;
+ alpha*-*-openbsd*)
+-  tm_defines=${tm_defines} OBSD_HAS_DECLARE_FUNCTION_NAME 
OBSD_HAS_DECLARE_FUNCTION_SIZE OBSD_HAS_DECLARE_OBJECT
++  tm_defines=${tm_defines} OBSD_HAS_DECLARE_FUNCTION_NAME 
OBSD_HAS_DECLARE_FUNCTION_SIZE OBSD_HAS_DECLARE_OBJECT PIE_DEFAULT=2
+   tm_file=alpha/alpha.h alpha/elf.h openbsd.h openbsd-stdint.h 
alpha/openbsd.h openbsd-libpthread.h
+   extra_options=${extra_options} openbsd.opt alpha/elf.opt
+   # default x-alpha is only appropriate for dec-osf.
 @@ -1057,10 +1065,14 @@ hppa*-*-linux*)
tmake_file=$tmake_file pa/t-slibgcc-dwarf-ver
fi
@@ -35,7 +44,14 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
  hppa[12]*-*-hpux10*)
case ${target} in
hppa1.1-*-* | hppa2*-*-*)
-@@ -1254,6 +1266,12 @@ i[34567]86-*-openbsd*)
+@@ -1248,12 +1260,19 @@ i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
+   use_collect2=yes
+   ;;
+ i[34567]86-*-openbsd*)
++  tm_defines=${tm_defines} PIE_DEFAULT=1
+   tm_file=${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h
+   tm_file=${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h 
i386/openbsdelf.h
+   extra_options=${extra_options} openbsd.opt
gas=yes
gnu_ld=yes
;;
@@ -48,7 +64,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
  i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu 
| i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
# Intel 80386's running GNU/*
# with ELF format using glibc 2
-@@ -1914,14 +1932,15 @@ mips*-*-linux*)# Linux 
MIPS, either endian.
+@@ -1914,14 +1933,15 @@ mips*-*-linux*)# Linux 
MIPS, either endian.
test x$with_llsc != x || with_llsc=yes
;;
  mips*-*-openbsd*)
@@ -69,7 +85,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
  esac
;;
  mips*-sde-elf*)
-@@ -2061,10 +2080,11 @@ picochip-*)
+@@ -2061,10 +2081,11 @@ picochip-*)
tmake_file=picochip/t-picochip t-pnt16-warn
  ;;
  # port not yet contributed
@@ -85,7 +101,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
  powerpc-*-darwin*)
extra_options=${extra_options} rs6000/darwin.opt
extra_parts=crt2.o
-@@ -2665,6 +2685,7 @@ sparc64-*-netbsd*)
+@@ -2665,6 +2686,7 @@ sparc64-*-netbsd*)
tmake_file=${tmake_file} sparc/t-netbsd64
;;
  sparc64-*-openbsd*)
@@ -93,7 +109,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
tm_file=sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h 
sparc/sp64-elf.h
tm_file=${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h 
sparc/openbsd64.h
extra_options=${extra_options} openbsd.opt
-@@ -2826,6 +2847,12 @@ case ${target} in
+@@ -2826,6 +2848,12 @@ case 

Re: UPDATE: GCC 4.6 / 4.8 -- PIE fixes

2014-01-11 Thread Pascal Stumpf
On Sat, 11 Jan 2014 15:06:19 -0500, Brad Smith wrote:
 Here is a diff to enable PIE by default with the GCC 4.6 / 4.8 ports,
 but while there I noticed alpha was missed for 4.6 and 4.8 has PIE
 enabled for powerpc but PIE support hasn't been enabled by default
 yet so disable it for now.
 
 Stuart, please check this and put it into a bulk build.

I already sent a diff to sthen@ (also switching gfortran and g77), but
he wanted to wait until most of the other PIE fallout on i386 is fixed,
so please hold off that part for now.

The alpha/powerpc part is an oversight though, so ok.

 Index: 4.6/Makefile
 ===
 RCS file: /home/cvs/ports/lang/gcc/4.6/Makefile,v
 retrieving revision 1.66
 diff -u -p -u -p -r1.66 Makefile
 --- 4.6/Makefile  25 Nov 2013 14:16:23 -  1.66
 +++ 4.6/Makefile  11 Jan 2014 19:26:44 -
 @@ -24,14 +24,14 @@ PKGNAME-ada =   gnat-${FULL_PKGVERSION}
  PKGNAME-go = gccgo-${FULL_PKGVERSION}
  PKGSPEC-main = gcc-=4.6,4.7
  
 -REVISION-main =  4
 -REVISION-c++ =   1
 -#REVISION-estdc =
 -REVISION-f95 =   1
 -REVISION-java =  1
 -REVISION-objc =  0
 -REVISION-ada =   3
 -REVISION-go =1
 +REVISION-main =  5
 +REVISION-c++ =   2
 +REVISION-estdc = 0
 +REVISION-f95 =   2
 +REVISION-java =  2
 +REVISION-objc =  1
 +REVISION-ada =   4
 +REVISION-go =2
  
  SHARED_LIBS =estdc++ 14.0 \
   gfortran3.0 \
 Index: 4.6/patches/patch-gcc_config_gcc
 ===
 RCS file: /home/cvs/ports/lang/gcc/4.6/patches/patch-gcc_config_gcc,v
 retrieving revision 1.7
 diff -u -p -u -p -r1.7 patch-gcc_config_gcc
 --- 4.6/patches/patch-gcc_config_gcc  7 Jun 2013 07:54:23 -   1.7
 +++ 4.6/patches/patch-gcc_config_gcc  11 Jan 2014 19:43:36 -
 @@ -1,6 +1,6 @@
  $OpenBSD: patch-gcc_config_gcc,v 1.7 2013/06/07 07:54:23 pascal Exp $
  gcc/config.gcc.orig  Wed Mar  6 18:40:07 2013
 -+++ gcc/config.gcc   Sat Apr 13 16:20:31 2013
 +--- gcc/config.gcc.orig  Wed Mar  6 12:40:07 2013
  gcc/config.gcc   Sat Jan 11 14:42:08 2014
  @@ -668,6 +668,14 @@ case ${target} in
   *-*-openbsd2.*|*-*-openbsd3.[012])
 tm_defines=${tm_defines} HAS_LIBC_R=1 ;;
 @@ -16,6 +16,15 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
 ;;
   *-*-rtems*)
 case ${enable_threads} in
 +@@ -741,7 +749,7 @@ alpha*-*-netbsd*)
 + tmake_file=${tmake_file} alpha/t-alpha alpha/t-ieee
 + ;;
 + alpha*-*-openbsd*)
 +-tm_defines=${tm_defines} OBSD_HAS_DECLARE_FUNCTION_NAME 
 OBSD_HAS_DECLARE_FUNCTION_SIZE OBSD_HAS_DECLARE_OBJECT
 ++tm_defines=${tm_defines} OBSD_HAS_DECLARE_FUNCTION_NAME 
 OBSD_HAS_DECLARE_FUNCTION_SIZE OBSD_HAS_DECLARE_OBJECT PIE_DEFAULT=2
 + tm_file=alpha/alpha.h alpha/elf.h openbsd.h openbsd-stdint.h 
 alpha/openbsd.h openbsd-libpthread.h
 + extra_options=${extra_options} openbsd.opt alpha/elf.opt
 + # default x-alpha is only appropriate for dec-osf.
  @@ -1057,10 +1065,14 @@ hppa*-*-linux*)
   tmake_file=$tmake_file pa/t-slibgcc-dwarf-ver
   fi
 @@ -35,7 +44,14 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
   hppa[12]*-*-hpux10*)
   case ${target} in
   hppa1.1-*-* | hppa2*-*-*)
 -@@ -1254,6 +1266,12 @@ i[34567]86-*-openbsd*)
 +@@ -1248,12 +1260,19 @@ i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
 + use_collect2=yes
 + ;;
 + i[34567]86-*-openbsd*)
 ++tm_defines=${tm_defines} PIE_DEFAULT=1
 + tm_file=${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h
 + tm_file=${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h 
 i386/openbsdelf.h
 + extra_options=${extra_options} openbsd.opt
   gas=yes
   gnu_ld=yes
   ;;
 @@ -48,7 +64,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
   i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | 
 i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu* | 
 i[34567]86-*-kopensolaris*-gnu)
   # Intel 80386's running GNU/*
   # with ELF format using glibc 2
 -@@ -1914,14 +1932,15 @@ mips*-*-linux*)  # Linux 
 MIPS, either endian.
 +@@ -1914,14 +1933,15 @@ mips*-*-linux*)  # Linux 
 MIPS, either endian.
   test x$with_llsc != x || with_llsc=yes
   ;;
   mips*-*-openbsd*)
 @@ -69,7 +85,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
   esac
   ;;
   mips*-sde-elf*)
 -@@ -2061,10 +2080,11 @@ picochip-*)
 +@@ -2061,10 +2081,11 @@ picochip-*)
   tmake_file=picochip/t-picochip t-pnt16-warn
   ;;
   # port not yet contributed
 @@ -85,7 +101,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
   powerpc-*-darwin*)
   extra_options=${extra_options} rs6000/darwin.opt
   extra_parts=crt2.o
 -@@ -2665,6 +2685,7 @@ sparc64-*-netbsd*)
 +@@ -2665,6 +2686,7 @@ sparc64-*-netbsd*)
   tmake_file=${tmake_file} sparc/t-netbsd64
   ;;
   sparc64-*-openbsd*)
 @@ 

Re: [update] py-simplejson

2014-01-11 Thread Federico Schwindt
before that all ports using it should be checked to ensure they will work
with the bundled json module.


On Sat, Jan 11, 2014 at 6:48 PM, frantisek holop min...@obiit.org wrote:

 after some soul searching (and googling), i actually
 cannot come up with a good reason why this package is
 needed...  it is included in 2.7 if i read the docs
 correctly.  perhaps it should go to the attic.

 -f

 hmm, on Tue, Dec 31, 2013 at 10:01:34AM -0500, Eric Radman said that
  On Sun, Dec 29, 2013 at 12:18:28PM +0100, frantisek holop wrote:
   hmm, on Sat, Dec 28, 2013 at 11:54:28PM -0800, Martynas Venckus said
 that
The diff looks good but I don't use this anymore, so could you remove
me as maintainer and find someone to take care of testing/committing
it?
  
   ok, i take over.  attached the new version.
   please test and commit.
  
   -f
   --
   i'm here to question all your answers.
 
   Index: Makefile
   ===
   RCS file: /cvs/ports/devel/py-simplejson/Makefile,v
   retrieving revision 1.19
   diff -u -p -r1.19 Makefile
   --- Makefile11 Mar 2013 10:50:26 -  1.19
   +++ Makefile29 Dec 2013 11:16:55 -
   @@ -2,15 +2,14 @@
  
COMMENT =  JSON encoder/decoder
  
   -MODPY_EGG_VERSION =2.5.0
   +MODPY_EGG_VERSION =3.3.1
 
  simplejson is listed as a dependency for several ports, but are they
  using it?  It has been bundled with Python since 2.6.  Projects that
  still support Python 2.5 will typically do include some logic that tries
  to import the standard library first
 
  try:
  import json
  except ImportError:
  import simplejson as json

 --
 so you think you can tell heaven from hell.




Re: [new] mpv 0.3.2

2014-01-11 Thread Brett Mahar
On Sat, 11 Jan 2014 18:53:23 +0100
frantisek holop min...@obiit.org wrote:

| this is a new update for mpv the player based on
| mplayer.
| 
| changes from 0.2.4:
| -build system switched to waf. as the waf port is uphill
| battle and i dont feel strongly about it, this port
| goes around that dependency using SUPDISTFILES
| 

Hi Frantisek,

I'm having some trouble building this on amd64-current:

It can't find the library i386:

...
=== mpv-0.3.2 depends on: libbluray-* - libbluray-0.2.3
=== mpv-0.3.2 depends on: libiconv-* - libiconv-1.14p1
===  Verifying specs: GL X11 Xext Xinerama Xss Xv Xxf86vm ass avcodec  
avdevice avfilter avformat avutil bluray c dvdread  enca i386 jpeg lcms2 m mng 
ncurses postproc pthread  sndio swresample swscale z iconv=2 GL X11 Xext 
Xinerama Xss Xv Xxf86vm ass avcodec  avdevice avfilter avformat avutil bluray c 
dvdread  enca i386 jpeg lcms2 m mng ncurses postproc pthread  sndio swresample 
swscale z iconv=2
Missing library for i386=0.0
Fatal error
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2149 
'/usr/ports/pobj/mpv-0.3.2/.buildwantlibs')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2481 
'/usr/ports/pobj/mpv-0.3.2/.extract_done')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1874 
'/usr/ports/packages/amd64/all/mpv-0.3.2.tgz')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2426 
'_internal-package')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2406 'package')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1891 
'/var/db/pkg/mpv-0.3.2/+CONTENTS')
*** Error 1 in /usr/ports/mystuff/x11/mpv 
(/usr/ports/infrastructure/mk/bsd.port.mk:2406 'install')


I edited the makefile to just delete the WANTLIB for i386 just to see what 
would happen and it gets to /usr/ports/distfiles/waf-1.7.13: No such file or 
directory:

===  Checking files for mpv-0.3.2
`/usr/ports/distfiles/mpv-0.3.2.tar.gz' is up to date.
 (SHA256) mpv-0.3.2.tar.gz: OK
=== mpv-0.3.2 depends on: py-docutils-* - py-docutils-0.11
=== mpv-0.3.2 depends on: python-=2.7,2.8 - python-2.7.5p0
=== mpv-0.3.2 depends on: libdvdread-* - libdvdread-4.2.0p2
=== mpv-0.3.2 depends on: jpeg-* - jpeg-9p0
=== mpv-0.3.2 depends on: ffmpeg-* - ffmpeg-20131216p0
=== mpv-0.3.2 depends on: lcms2-* - lcms2-2.5
=== mpv-0.3.2 depends on: libmng-* - libmng-1.0.10p2
=== mpv-0.3.2 depends on: libass-* - libass-0.10.2
=== mpv-0.3.2 depends on: libbluray-* - libbluray-0.2.3
=== mpv-0.3.2 depends on: libiconv-* - libiconv-1.14p1
===  Verifying specs: GL X11 Xext Xinerama Xss Xv Xxf86vm ass avcodec  
avdevice avfilter avformat avutil bluray c dvdread  enca jpeg lcms2 m mng 
ncurses postproc pthread   iconv=2 GL X11 Xext Xinerama Xss Xv Xxf86vm ass 
avcodec  avdevice avfilter avformat avutil bluray c dvdread  enca jpeg lcms2 m 
mng ncurses postproc pthread   iconv=2
===  found GL.15.0 X11.16.0 Xext.13.0 Xinerama.6.0 Xss.6.0 Xv.6.0 Xxf86vm.6.0 
ass.1.0 avcodec.19.1 avdevice.7.1 avfilter.5.1 avformat.17.1 avutil.11.1 
bluray.1.0 c.73.0 dvdread.5.1 enca.0.0 jpeg.66.0 lcms2.1.0 m.9.0 mng.3.1 
ncurses.14.0 postproc.15.1 pthread.18.0 iconv.6.0
===  Extracting for mpv-0.3.2
cp /usr/ports/distfiles/waf-1.7.13 /usr/ports/pobj/mpv-0.3.2/mpv-0.3.2/waf
cp: /usr/ports/distfiles/waf-1.7.13: No such file or directory
*** Error 1 in . (Makefile:103 'post-extract')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2488 
'/usr/ports/pobj/mpv-0.3.2/.extract_done')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1874 
'/usr/ports/packages/amd64/all/mpv-0.3.2.tgz')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2426 
'_internal-package')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2406 'package')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1891 
'/var/db/pkg/mpv-0.3.2/+CONTENTS')
*** Error 1 in /usr/ports/mystuff/x11/mpv 
(/usr/ports/infrastructure/mk/bsd.port.mk:2406 'install')