cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cope with the wxWidgets3 update

Browse Source 
ok ajacoutot@ landry@ giovanni@
This commit is contained in:
jca 2019-01-02 12:44:06 +00:00
parent 20c596a0d9
commit 16c8a26880
47 changed files with 744 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
databases/pgadmin3/Makefile
View File

@ -1,40 +1,40 @@
# $OpenBSD: Makefile,v 1.40 2018/10/25 07:32:43 landry Exp $
# $OpenBSD: Makefile,v 1.41 2019/01/02 12:44:06 jca Exp $
COMMENT= administration and development platform for PostgreSQL
V= 1.22.1
DISTNAME= pgadmin3-$V
CATEGORIES= databases devel
REVISION= 2
REVISION= 3
HOMEPAGE= http://www.pgadmin.org/
HOMEPAGE= https://www.pgadmin.org/
MAINTAINER= Pierre-Emmanuel Andre <pea@openbsd.org>
# Artistic license
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c m pthread ${COMPILER_LIBCXX} crypto z
WANTLIB += ${COMPILER_LIBCXX} c crypto m pq wx_baseu-3.0 wx_baseu_net-3.0
WANTLIB += wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0
WANTLIB += wx_gtk3u_core-3.0 wx_gtk3u_html-3.0 wx_gtk3u_stc-3.0
WANTLIB += wx_gtk3u_xrc-3.0 xml2 xslt z
MASTER_SITES= https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v$V/src/
COMPILER = base-clang ports-gcc base-gcc
LIB_DEPENDS= x11/wxWidgets>=2.8.7 \
LIB_DEPENDS= x11/wxWidgets>=3.0.4 \
databases/postgresql \
textproc/libxml>=2.4.8 \
textproc/libxslt
WANTLIB += wx_base_xml wx_gtk2_html \
wx_gtk2_stc wx_gtk2_adv wx_gtk2_aui wx_gtk2_xrc \
wx_base_net wx_base wx_gtk2_core \
pq>=4 xml2>=6 xslt>=3
BUILD_DEPENDS += databases/postgresql,-server \
textproc/py-sphinx
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS}"
CONFIGURE_ARGS= --with-pgsql=${LOCALBASE}
CONFIGURE_ARGS= --with-pgsql=${LOCALBASE} \
--with-wx-version=3.0
USE_GMAKE= Yes

28
devel/codeblocks/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.52 2018/12/13 19:53:23 sthen Exp $
# $OpenBSD: Makefile,v 1.53 2019/01/02 12:44:06 jca Exp $
BROKEN-alpha= sqvm.cpp:394:1: internal compiler error: Segmentation fault
COMMENT= Code::Blocks C/C++ IDE
V= 17.12
REVISION= 4
REVISION= 5
DISTNAME= codeblocks_${V}
PKGNAME= codeblocks-${V}
EXTRACT_SUFX= .tar.xz
@ -32,17 +32,19 @@ HOMEPAGE= http://www.codeblocks.org/
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ${COMPILER_LIBCXX} ICE SDL SM X11 Xcomposite Xcursor
WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += atk-1.0 boost_system bz2 c cairo expat ffi fontconfig
WANTLIB += freetype gamin-1 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
WANTLIB += gtk-x11-2.0 harfbuzz hunspell-1.6 iconv intl iodbc
WANTLIB += jpeg m mspack pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png sndio tiff usbhid wx_base wx_base_net
WANTLIB += wx_base_odbc wx_base_xml wx_gtk2_adv wx_gtk2_aui wx_gtk2_core
WANTLIB += wx_gtk2_dbgrid wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext
WANTLIB += wx_gtk2_xrc xcb xcb-render xcb-shm z
WANTLIB += atk-1.0 atk-bridge-2.0 atspi boost_system bz2 c cairo
WANTLIB += cairo-gobject dbus-1 epoxy expat ffi fontconfig freetype
WANTLIB += fribidi gamin-1 gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
WANTLIB += harfbuzz hunspell-1.6 iconv intl jpeg m mspack notify
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png16 samplerate sndio tiff usbhid wx_baseu-3.0 wx_baseu_net-3.0
WANTLIB += wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0
WANTLIB += wx_gtk3u_core-3.0 wx_gtk3u_html-3.0 wx_gtk3u_propgrid-3.0
WANTLIB += wx_gtk3u_qa-3.0 wx_gtk3u_richtext-3.0 wx_gtk3u_xrc-3.0
WANTLIB += xcb xcb-render xcb-shm z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=codeblocks/Sources/${V}/}
@ -52,7 +54,7 @@ LIB_DEPENDS= archivers/bzip2 \
devel/boost \
sysutils/gamin \
textproc/hunspell \
x11/wxWidgets
x11/wxWidgets>=3.0.4
RUN_DEPENDS= devel/desktop-file-utils \
misc/shared-mime-info \

24
devel/codeblocks/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2018/07/01 18:33:35 espie Exp $
@comment $OpenBSD: PLIST,v 1.14 2019/01/02 12:44:06 jca Exp $
@bin bin/cb_console_runner
@bin bin/cb_share_config
@bin bin/codeblocks
@ -207,10 +207,6 @@ include/codeblocks/wxContribItems/wxMathPlot/
include/codeblocks/wxContribItems/wxMathPlot/mathplot.h
include/codeblocks/wxContribItems/wxSpeedButton/
include/codeblocks/wxContribItems/wxSpeedButton/wxSpeedButton.h
include/codeblocks/wxContribItems/wxTreeList/
include/codeblocks/wxContribItems/wxTreeList/include/
include/codeblocks/wxContribItems/wxTreeList/include/wx/
include/codeblocks/wxContribItems/wxTreeList/include/wx/treelistctrl.h
include/codeblocks/wxContribItems/wxchart/
include/codeblocks/wxContribItems/wxchart/include/
include/codeblocks/wxContribItems/wxchart/include/wx/
@ -267,20 +263,6 @@ include/codeblocks/wxContribItems/wxthings/include/wx/
include/codeblocks/wxContribItems/wxthings/include/wx/things/
include/codeblocks/wxContribItems/wxthings/include/wx/things/thingdef.h
include/codeblocks/wxContribItems/wxthings/include/wx/things/toggle.h
include/codeblocks/wxpropgrid/
include/codeblocks/wxpropgrid/include/
include/codeblocks/wxpropgrid/include/wx/
include/codeblocks/wxpropgrid/include/wx/propgrid/
include/codeblocks/wxpropgrid/include/wx/propgrid/advprops.h
include/codeblocks/wxpropgrid/include/wx/propgrid/editors.h
include/codeblocks/wxpropgrid/include/wx/propgrid/extras.h
include/codeblocks/wxpropgrid/include/wx/propgrid/manager.h
include/codeblocks/wxpropgrid/include/wx/propgrid/odcombo.h
include/codeblocks/wxpropgrid/include/wx/propgrid/pg_dox_mainpage.h
include/codeblocks/wxpropgrid/include/wx/propgrid/propdev.h
include/codeblocks/wxpropgrid/include/wx/propgrid/propgrid.h
include/codeblocks/wxpropgrid/include/wx/propgrid/props.h
include/codeblocks/wxpropgrid/include/wx/propgrid/xh_propgrid.h
include/codeblocks/wxscintilla/
include/codeblocks/wxscintilla/include/
include/codeblocks/wxscintilla/include/wx/
@ -465,9 +447,6 @@ lib/codeblocks/wxContribItems/libwxmathplot.la
lib/codeblocks/wxContribItems/libwxspeedbutton.a
lib/codeblocks/wxContribItems/libwxspeedbutton.la
@lib lib/codeblocks/wxContribItems/libwxspeedbutton.so.${LIBwxspeedbutton_VERSION}
lib/codeblocks/wxContribItems/libwxtreelist.a
lib/codeblocks/wxContribItems/libwxtreelist.la
@lib lib/codeblocks/wxContribItems/libwxtreelist.so.${LIBwxtreelist_VERSION}
lib/libcodeblocks.a
lib/libcodeblocks.la
@lib lib/libcodeblocks.so.${LIBcodeblocks_VERSION}
@ -483,7 +462,6 @@ lib/pkgconfig/cb_wximagepanel.pc
lib/pkgconfig/cb_wxled.pc
lib/pkgconfig/cb_wxmathplot.pc
lib/pkgconfig/cb_wxspeedbutton.pc
lib/pkgconfig/cb_wxtreelist.pc
lib/pkgconfig/codeblocks.pc
lib/pkgconfig/wxsmith-contrib.pc
lib/pkgconfig/wxsmith.pc

6
devel/p5-Alien-wxWidgets/Makefile
View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.12 2017/05/06 08:53:45 benoit Exp $
# $OpenBSD: Makefile,v 1.13 2019/01/02 12:44:06 jca Exp $
COMMENT = building, finding and using wxWidgets binaries
MODULES = cpan
PKG_ARCH = *
DISTNAME = Alien-wxWidgets-0.69
REVISION = 0
CATEGORIES = devel
# perl
@ -13,7 +15,7 @@ PERMIT_PACKAGE_CDROM = Yes
CONFIGURE_STYLE = modbuild
RUN_DEPENDS = devel/p5-Module-Pluggable \
x11/wxWidgets,-media \
x11/wxWidgets,-media>=3.0.4 \
www/p5-LWP-Protocol-https
BUILD_DEPENDS = ${RUN_DEPENDS}

40
devel/p5-Alien-wxWidgets/patches/patch-inc_My_Build_Any_wx_config_Bakefile_pm
View File

@ -1,16 +1,30 @@
$OpenBSD: patch-inc_My_Build_Any_wx_config_Bakefile_pm,v 1.3 2013/03/21 01:34:47 sthen Exp $
use glob() to find all matching $lib.so.*, and take the last value
--- inc/My/Build/Any_wx_config_Bakefile.pm.orig Mon Dec 28 19:10:47 2009
+++ inc/My/Build/Any_wx_config_Bakefile.pm Thu Mar 21 01:30:26 2013
@@ -3,7 +3,6 @@ package My::Build::Any_wx_config_Bakefile;
use strict;
our @ISA = qw(My::Build::Any_wx_config::Base);
use Config;
-
sub awx_wx_config_data {
my $self = shift;
return $self->{awx_data} if $self->{awx_data};
@@ -44,8 +43,13 @@ sub awx_wx_config_data {
$OpenBSD: patch-inc_My_Build_Any_wx_config_Bakefile_pm,v 1.4 2019/01/02 12:44:06 jca Exp $
Stop hardcoding shared libs names and versions from the OpenBSD port.
Use the same naming scheme as elsewhere.
Use glob() to find all matching $lib.so.*, and take the last value.
Index: inc/My/Build/Any_wx_config_Bakefile.pm
--- inc/My/Build/Any_wx_config_Bakefile.pm.orig
+++ inc/My/Build/Any_wx_config_Bakefile.pm
@@ -25,15 +25,8 @@ sub awx_wx_config_data {
@mono_libs :
@My::Build::Any_wx_config::LIBRARIES );
my $libraries = $self->_call_wx_config( $arg );
+ my $libname_re = '-l(.*_(\w+)-.*)';
- my( $libname_re, $libsuffix );
- if( $^O eq 'openbsd' ) {
- $libname_re = '-l(.*_(\w+))';
- $libsuffix = '.1.0';
- } else {
- $libname_re = '-l(.*_(\w+)-.*)';
- $libsuffix = '';
- }
foreach my $lib ( grep { m/\-lwx/ } split ' ', $libraries ) {
$lib =~ m/$libname_re/ or die $lib;
my( $key, $name ) = ( $2, $1 );
@@ -44,8 +37,13 @@ sub awx_wx_config_data {
$key = 'core' if $key =~ m/^gtk2?[ud]{0,2}/
&& $self->awx_is_monolithic
&& $lib =~ m/(?:gtk2?|mac)[ud]{0,2}-/;

5
devel/p5-Alien-wxWidgets/pkg/PLIST
View File

@ -1,10 +1,9 @@
@comment $OpenBSD: PLIST,v 1.2 2009/09/08 21:46:17 landry Exp $
${P5ARCH}/
@comment $OpenBSD: PLIST,v 1.3 2019/01/02 12:44:06 jca Exp $
${P5ARCH}/Alien/
${P5ARCH}/Alien/wxWidgets/
${P5ARCH}/Alien/wxWidgets.pm
${P5ARCH}/Alien/wxWidgets/Config/
${P5ARCH}/Alien/wxWidgets/Config/gtk2_gcc.pm
${P5ARCH}/Alien/wxWidgets/Config/gtk_uni_gcc.pm
${P5ARCH}/Alien/wxWidgets/Utility.pm
@man man/man3p/Alien::wxWidgets.3p
@man man/man3p/Alien::wxWidgets::Utility.3p

10
devel/poedit/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.28 2018/10/24 14:28:00 sthen Exp $
# $OpenBSD: Makefile,v 1.29 2019/01/02 12:44:06 jca Exp $
COMMENT= cross-platform gettext catalogs (PO-files) editor
DISTNAME= poedit-1.3.7
REVISION= 12
REVISION= 13
CATEGORIES= devel
HOMEPAGE= http://www.poedit.net/
@ -15,8 +15,10 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poedit/}
# GPL
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c m pthread ${COMPILER_LIBCXX} wx_base_xml wx_gtk2_html wx_gtk2_adv \
wx_gtk2_xrc wx_base wx_gtk2_core
WANTLIB += c m pthread ${COMPILER_LIBCXX}
WANTLIB += wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0
WANTLIB += wx_gtk3u_core-3.0 wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0
WANTLIB += wx_gtk3u_xrc-3.0
COMPILER = base-clang ports-gcc base-gcc

14
devel/poedit/patches/patch-src_prefsdlg_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_prefsdlg_cpp,v 1.1 2019/01/02 12:44:06 jca Exp $
Index: src/prefsdlg.cpp
--- src/prefsdlg.cpp.orig
+++ src/prefsdlg.cpp
@@ -210,7 +210,7 @@ void PreferencesDialog::TransferFrom(wxConfigBase *cfg
cfg->Write(_T("custom_font_text_name"),
XRCCTRL(*this, "fontname_text", wxTextCtrl)->GetValue());
- static wxChar *formats[] =
+ static wxString formats[] =
{ _T("unix"), _T("win"), _T("mac"), _T("native") };
cfg->Write(_T("crlf_format"), formats[
XRCCTRL(*this, "crlf_format", wxChoice)->GetSelection()]);

36
devel/rapidsvn/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.33 2018/10/24 14:28:01 sthen Exp $
# $OpenBSD: Makefile,v 1.34 2019/01/02 12:44:06 jca Exp $
# XXX doesn't build if already installed
COMMENT= graphical subversion client
@ -6,7 +6,7 @@ COMMENT= graphical subversion client
VERSION= 0.12.1
DISTNAME= rapidsvn-${VERSION}
CATEGORIES= devel
REVISION= 11
REVISION= 12
HOMEPAGE= http://www.rapidsvn.org/
@ -19,21 +19,21 @@ MASTER_SITES= ${HOMEPAGE}download/release/${VERSION}/
# GPLv3+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ICE SDL SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm apr-1 aprutil-1
WANTLIB += atk-1.0 c cairo db expat ffi fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl iodbc jpeg
WANTLIB += m mspack pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread sasl2 serf-1 sndio
WANTLIB += sqlite3 ${COMPILER_LIBCXX} svn_client-1 svn_delta-1 svn_diff-1
WANTLIB += svn_fs-1 svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_fs_x-1
WANTLIB += svn_ra-1 svn_ra_local-1 svn_ra_serf-1 svn_ra_svn-1
WANTLIB += svn_repos-1 svn_subr-1 svn_wc-1 tiff usbhid wx_base
WANTLIB += wx_base_net wx_base_odbc wx_base_xml wx_gtk2_adv wx_gtk2_aui
WANTLIB += wx_gtk2_core wx_gtk2_dbgrid wx_gtk2_html wx_gtk2_qa
WANTLIB += wx_gtk2_richtext wx_gtk2_xrc xcb xcb-render xcb-shm
WANTLIB += z
WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += apr-1 aprutil-1 atk-1.0 atk-bridge-2.0 atspi c cairo
WANTLIB += cairo-gobject db dbus-1 epoxy expat ffi fontconfig
WANTLIB += freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
WANTLIB += harfbuzz iconv intl jpeg lz4 m mspack notify pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png16 samplerate
WANTLIB += sasl2 serf-1 sndio sqlite3 svn_client-1 svn_delta-1
WANTLIB += svn_diff-1 svn_fs-1 svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1
WANTLIB += svn_fs_x-1 svn_ra-1 svn_ra_local-1 svn_ra_serf-1 svn_ra_svn-1
WANTLIB += svn_repos-1 svn_subr-1 svn_wc-1 tiff usbhid wx_baseu-3.0
WANTLIB += wx_baseu_net-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0
WANTLIB += wx_gtk3u_core-3.0 wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0
WANTLIB += wx_gtk3u_xrc-3.0 xcb xcb-render xcb-shm z
COMPILER = base-clang ports-gcc base-gcc
@ -41,7 +41,7 @@ USE_GMAKE= Yes
BUILD_DEPENDS= devel/gettext-tools
LIB_DEPENDS= x11/wxWidgets \
LIB_DEPENDS= x11/wxWidgets>=3.0.4 \
devel/subversion \
databases/sqlite3
CONFIGURE_STYLE=gnu

14
devel/rapidsvn/patches/patch-configure Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-configure,v 1.1 2019/01/02 12:44:06 jca Exp $
Index: configure
--- configure.orig
+++ configure
@@ -15176,6 +15176,8 @@ case $WX_VERSION in
;;
2.[5-9].*)
;;
+ 3.*)
+ ;;
*)
as_fn_error $? "wxWidgets >= 2.4.2 required, found version $WX_VERSION" "$LINENO" 5
as_fn_error $? "Try --with-wx-config." "$LINENO" 5

25
devel/rapidsvn/patches/patch-src_filelist_ctrl_cpp Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-src_filelist_ctrl_cpp,v 1.1 2019/01/02 12:44:06 jca Exp $
Index: src/filelist_ctrl.cpp
--- src/filelist_ctrl.cpp.orig
+++ src/filelist_ctrl.cpp
@@ -1606,7 +1606,7 @@ FileListCtrl::GetColumnVisible(const int col) const
}
}
-inline void
+inline bool
FileListCtrl::SetColumnWidth(const int col, const int width)
{
m->ColumnWidth[col] = width;
@@ -1614,8 +1614,9 @@ FileListCtrl::SetColumnWidth(const int col, const int
int index = m->ColumnIndex[col];
if (index != -1)
{
- wxListCtrl::SetColumnWidth(index, width);
+ return wxListCtrl::SetColumnWidth(index, width);
}
+ return false;
}
int

14
devel/rapidsvn/patches/patch-src_filelist_ctrl_hpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_filelist_ctrl_hpp,v 1.1 2019/01/02 12:44:06 jca Exp $
Index: src/filelist_ctrl.hpp
--- src/filelist_ctrl.hpp.orig
+++ src/filelist_ctrl.hpp
@@ -118,7 +118,7 @@ class FileListCtrl : public wxListView (public)
* @param col column number
* @param width
*/
- void
+ bool
SetColumnWidth(const int col, const int width);
/**

16
devel/rapidsvn/patches/patch-src_hist_val_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_hist_val_cpp,v 1.1 2019/01/02 12:44:06 jca Exp $
https://docs.wxwidgets.org/3.0/classwx_combo_box.html#a41789d188664ce4d05500b8452798c8f
Index: src/hist_val.cpp
--- src/hist_val.cpp.orig
+++ src/hist_val.cpp
@@ -113,7 +113,7 @@ HistoryValidator::TransferToWindow()
}
// if we have an entry, select it
- if (!comboBox->IsEmpty())
+ if (!comboBox->IsTextEmpty())
comboBox->SetSelection(0, 0);
}

16
devel/rapidsvn/patches/patch-src_listener_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_listener_cpp,v 1.3 2019/01/02 12:44:06 jca Exp $
wxwidgets: wxOPEN was deprecated, use wxFD_OPEN
Index: src/listener.cpp
--- src/listener.cpp.orig
+++ src/listener.cpp
@@ -167,7 +167,7 @@ struct Listener::Data (public)
wxMutexLocker lock(mutex);
wxString localCertFile = wxFileSelector(
_("Select Certificate File"), wxT(""), wxT(""), wxT(""),
- wxT("*.*"), wxOPEN | wxFILE_MUST_EXIST, parent);
+ wxT("*.*"), wxFD_OPEN | wxFD_FILE_MUST_EXIST, parent);
LocalToUtf8(localCertFile, certFile);
dataReceived = !localCertFile.empty();

14
devel/rapidsvn/patches/patch-src_log_dlg_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_log_dlg_cpp,v 1.3 2019/01/02 12:44:06 jca Exp $
Index: src/log_dlg.cpp
--- src/log_dlg.cpp.orig
+++ src/log_dlg.cpp
@@ -211,7 +211,7 @@ class LogList : public wxListCtrl (private)
for (size_t idx = 0; idx < str.Length(); idx++)
{
- switch (str[idx])
+ switch ((wchar_t)str[idx])
{
case wxT('\r'):
case wxT('\n'):

16
devel/rapidsvn/patches/patch-src_preferences_dlg_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_preferences_dlg_cpp,v 1.3 2019/01/02 12:44:06 jca Exp $
wxwidgets: wxOPEN was deprecated, use wxFD_OPEN
Index: src/preferences_dlg.cpp
--- src/preferences_dlg.cpp.orig
+++ src/preferences_dlg.cpp
@@ -126,7 +126,7 @@ bool
PreferencesDlg::SelectExecutable(const wxString & title, wxTextCtrl * textCtrl)
{
wxFileDialog dlg(this, title, wxEmptyString, wxEmptyString,
- EXECUTABLE_WILDCARD, wxOPEN);
+ EXECUTABLE_WILDCARD, wxFD_OPEN);
dlg.SetPath(textCtrl->GetValue());
if (dlg.ShowModal() != wxID_OK)

25
devel/rapidsvn/patches/patch-src_rapidsvn_app_cpp Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-src_rapidsvn_app_cpp,v 1.1 2019/01/02 12:44:06 jca Exp $
wxwidgets: wxOPEN was deprecated, use wxFD_OPEN
Index: src/rapidsvn_app.cpp
--- src/rapidsvn_app.cpp.orig
+++ src/rapidsvn_app.cpp
@@ -195,7 +195,7 @@ RapidSvnApp::LocateHelp()
// TODO: Hmmm - I haven't called Initialise yet, but AddBook seems to work directly...
while (!m_helpController->AddBook(wxFileName(helpfile)))
{
- wxFileDialog dlg(NULL, _("Locate help"), appPath, wxEmptyString, wxT("*.htb"), wxOPEN | wxFILE_MUST_EXIST);
+ wxFileDialog dlg(NULL, _("Locate help"), appPath, wxEmptyString, wxT("*.htb"), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if (dlg.ShowModal() == wxID_OK)
{
helpfile = dlg.GetPath();
@@ -255,7 +255,7 @@ RapidSvnApp::MakeTipProvider(bool force)
while (!wxFileName(tipsfile).FileExists() || (tipProvider = wxCreateFileTipProvider(tipsfile, tipIndex)) == NULL)
{
- wxFileDialog dlg(NULL, _("Locate tips file"), appPath, wxEmptyString, wxT("*.txt"), wxOPEN | wxFILE_MUST_EXIST);
+ wxFileDialog dlg(NULL, _("Locate tips file"), appPath, wxEmptyString, wxT("*.txt"), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if (dlg.ShowModal() == wxID_OK)
{
tipsfile = dlg.GetPath();

12
games/megaglest/base/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.16 2018/12/10 14:39:17 jca Exp $
# $OpenBSD: Makefile,v 1.17 2019/01/02 12:44:06 jca Exp $
COMMENT = 3D real-time strategy game
GH_PROJECT = megaglest-source
PKGNAME = megaglest-${GH_TAGNAME}
REVISION = 2
REVISION = 3
WANTLIB += GL GLEW GLU ICE SDL2 SM X11 Xext c crypto curl fontconfig
WANTLIB += freetype fribidi ftgl glib-2.0 intl ircclient jpeg m
WANTLIB += miniupnpc nghttp2 openal png pthread ssl vlc vlccore
WANTLIB += vorbisfile wx_base wx_gtk2_core wx_gtk2_gl z
WANTLIB += freetype fribidi ftgl glib-2.0 intl ircclient jpeg
WANTLIB += m miniupnpc nghttp2 openal png16 ssl vlc vlccore vorbisfile
WANTLIB += wx_baseu-3.0 wx_gtk3u_core-3.0 wx_gtk3u_gl-3.0 z
WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
COMPILER = base-clang ports-gcc base-gcc
@ -25,7 +25,7 @@ LIB_DEPENDS = audio/openal \
net/libircclient \
net/miniupnp/miniupnpc \
x11/vlc,-main \
x11/wxWidgets
x11/wxWidgets>=3.0.4
CONFIGURE_ARGS = -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=0 \
-DFORCE_LUA_VERSION=${MODLUA_VERSION} \

16
games/scorched3d/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:04 sthen Exp $
# $OpenBSD: Makefile,v 1.13 2019/01/02 12:44:06 jca Exp $
COMMENT = modernization of the classic DOS game Scorched Earth
DISTNAME = Scorched3D-44-src
PKGNAME = ${DISTNAME:L:S/-src//}
REVISION = 0
REVISION = 1
CATEGORIES = games x11
@ -13,11 +13,11 @@ HOMEPAGE = http://www.scorched3d.co.uk/
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += GL GLEW GLU c expat freetype m pthread ${COMPILER_LIBCXX} z
WANTLIB += SDL SDL_net alut fftw3f jpeg openal png ogg vorbisfile
WANTLIB += wx_base wx_base_net wx_base_odbc wx_base_xml vorbis
WANTLIB += wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid
WANTLIB += wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc
WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU SDL SDL_net alut c expat
WANTLIB += fftw3f freetype jpeg m ogg openal png16 vorbis vorbisfile
WANTLIB += wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0
WANTLIB += wx_gtk3u_core-3.0 wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0
WANTLIB += wx_gtk3u_xrc-3.0 z
COMPILER = base-clang ports-gcc base-gcc
@ -31,7 +31,7 @@ LIB_DEPENDS = audio/openal \
devel/sdl-net \
graphics/glew \
math/fftw3,float \
x11/wxWidgets
x11/wxWidgets>=3.0.4
RUN_DEPENDS = devel/xdg-utils
CONFIGURE_STYLE = gnu

11
games/scorched3d/patches/patch-src_client_client_SecureID_cpp
View File

@ -1,22 +1,19 @@
$OpenBSD: patch-src_client_client_SecureID_cpp,v 1.3 2017/11/05 08:51:46 kirby Exp $
$OpenBSD: patch-src_client_client_SecureID_cpp,v 1.4 2019/01/02 12:44:07 jca Exp $
the comment portion is evil
Index: src/client/client/SecureID.cpp
--- src/client/client/SecureID.cpp.orig
+++ src/client/client/SecureID.cpp
@@ -75,7 +75,10 @@ std::string SecureID::GetPrivateKey(void)
@@ -76,6 +76,7 @@ std::string SecureID::GetPrivateKey(void)
#include <unistd.h>
#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
#include <net/if.h>
+#include <unistd.h>
std::string SecureID::GetPrivateKey(void)
{
@@ -110,6 +113,7 @@ std::string SecureID::GetPrivateKey(void)
@@ -110,6 +111,7 @@ std::string SecureID::GetPrivateKey(void)
if_freenameindex(NameList); //free the memory
@ -24,7 +21,7 @@ Index: src/client/client/SecureID.cpp
strcpy (dev.ifr_name, InterfaceName.c_str()); //select from the name
if (ioctl(sock, SIOCGIFHWADDR, &dev) < 0) //get the interface data
{
@@ -123,6 +127,7 @@ std::string SecureID::GetPrivateKey(void)
@@ -123,6 +125,7 @@ std::string SecureID::GetPrivateKey(void)
if (i != 5) Key += ':';
}
close(sock);

56
games/scorched3d/patches/patch-src_launcher_wxdialogs_DisplayDialog_cpp Normal file
View File

@ -0,0 +1,56 @@
$OpenBSD: patch-src_launcher_wxdialogs_DisplayDialog_cpp,v 1.1 2019/01/02 12:44:07 jca Exp $
Patch from Debian:
From: Markus Koschany <apo@debian.org>
Date: Fri, 15 Jul 2016 18:01:36 +0200
Subject: wx3.0 compat
Make Scorched3D compatible with wxWidgets 3.0
Thanks to Olly Betts for the patch.
---
src/launcher/wxdialogs/Display.cpp | 10 +++++-----
src/launcher/wxdialogs/DisplayDialog.cpp | 10 +++++-----
src/launcher/wxdialogs/SettingsDialog.cpp | 14 +++++++-------
3 files changed, 17 insertions(+), 17 deletions(-)
Index: src/launcher/wxdialogs/DisplayDialog.cpp
--- src/launcher/wxdialogs/DisplayDialog.cpp.orig
+++ src/launcher/wxdialogs/DisplayDialog.cpp
@@ -449,15 +449,15 @@ void DisplayFrame::refreshScreen()
IDC_SLIDER1_CTRL->SetValue(OptionsDisplay::instance()->getBrightness());
IDC_SLIDER1_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getBrightnessEntry().getDescription(), wxConvUTF8));
IDC_VOLUME_CTRL->SetRange(0, 128);
- IDC_VOLUME_CTRL->SetTickFreq(4, 0);
+ IDC_VOLUME_CTRL->SetTickFreq(4);
IDC_VOLUME_CTRL->SetValue(OptionsDisplay::instance()->getSoundVolume());
IDC_VOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getSoundVolumeEntry().getDescription(), wxConvUTF8));
IDC_MUSICVOLUME_CTRL->SetRange(0, 128);
- IDC_MUSICVOLUME_CTRL->SetTickFreq(4, 0);
+ IDC_MUSICVOLUME_CTRL->SetTickFreq(4);
IDC_MUSICVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getMusicVolume());
IDC_MUSICVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getMusicVolumeEntry().getDescription(), wxConvUTF8));
IDC_AMBIENTVOLUME_CTRL->SetRange(0, 128);
- IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4, 0);
+ IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4);
IDC_AMBIENTVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getAmbientSoundVolume());
IDC_AMBIENTVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getAmbientSoundVolumeEntry().getDescription(), wxConvUTF8));
IDC_USERNAME_CTRL->SetValue(wxString(OptionsDisplay::instance()->getOnlineUserName(), wxConvUTF8));
@@ -736,7 +736,7 @@ void DisplayFrame::onExportMod(wxCommandEvent &event)
#if wxCHECK_VERSION(2, 8, 0)
wxFD_SAVE);
#else
- wxSAVE);
+ wxFD_SAVE);
#endif
if (file.empty()) return;
ModFiles files;
@@ -764,7 +764,7 @@ void DisplayFrame::onImportMod(wxCommandEvent &event)
#if wxCHECK_VERSION(2, 8, 0)
wxFD_OPEN | wxFD_FILE_MUST_EXIST);
#else
- wxOPEN | wxFILE_MUST_EXIST);
+ wxFD_OPEN | wxFD_FILE_MUST_EXIST);
#endif
if (file.empty()) return;
ModFiles files;

65
games/scorched3d/patches/patch-src_launcher_wxdialogs_Display_cpp Normal file
View File

@ -0,0 +1,65 @@
$OpenBSD: patch-src_launcher_wxdialogs_Display_cpp,v 1.1 2019/01/02 12:44:07 jca Exp $
Patch from Debian:
From: Markus Koschany <apo@debian.org>
Date: Fri, 15 Jul 2016 18:01:36 +0200
Subject: wx3.0 compat
Make Scorched3D compatible with wxWidgets 3.0
Thanks to Olly Betts for the patch.
---
src/launcher/wxdialogs/Display.cpp | 10 +++++-----
src/launcher/wxdialogs/DisplayDialog.cpp | 10 +++++-----
src/launcher/wxdialogs/SettingsDialog.cpp | 14 +++++++-------
3 files changed, 17 insertions(+), 17 deletions(-)
Index: src/launcher/wxdialogs/Display.cpp
--- src/launcher/wxdialogs/Display.cpp.orig
+++ src/launcher/wxdialogs/Display.cpp
@@ -26,7 +26,7 @@ static void createMainControls(wxWindow *parent, wxSiz
// Display settings
wxStaticBox *displayBox = new wxStaticBox(parent, -1, wxT("&Display"));
wxStaticBoxSizer *displaySizer = new wxStaticBoxSizer(displayBox, wxVERTICAL);
- wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(2, 3, 5, 5);
+ wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(0, 3, 5, 5);
wxStaticText *resText = new wxStaticText(parent, -1, wxT("&Resolution :"));
IDC_DISPLAY_CTRL =
new wxComboBox(parent, -1,
@@ -88,7 +88,7 @@ static void createMainControls(wxWindow *parent, wxSiz
// Sound settings
wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound"));
wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox, wxVERTICAL);
- wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2);
+ wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(0, 4, 2, 0);
wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound Volume :"));
wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music Volume :"));
wxStaticText *ambientVolumeText = new wxStaticText(parent, -1, wxT("Ambient Volume :"));
@@ -137,7 +137,7 @@ static void createMainControls(wxWindow *parent, wxSiz
wxT("Game Detail Options"));
wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox, wxHORIZONTAL);
- wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2);
+ wxGridSizer *loadSizer = new wxFlexGridSizer(0, 2, 2, 0);
IDC_LOADULTRA_CTRL = new wxButton(parent, ID_LOADULTRA, wxT("&Ultra Detail"), wxDefaultPosition, wxSize(120,-1));
IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS, wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1));
IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster Detail"), wxDefaultPosition, wxSize(120,-1));
@@ -256,7 +256,7 @@ static void createSpeedControls(wxWindow *parent, wxSi
wxStaticBox *waterDetailBox = new wxStaticBox(parent, -1,
wxT("Graphics Detail"));
wxStaticBoxSizer *waterDetailSizer = new wxStaticBoxSizer(waterDetailBox, wxHORIZONTAL);
- wxGridSizer *waterDetailSizer2 = new wxGridSizer(3, 1, 10, 10);
+ wxGridSizer *waterDetailSizer2 = new wxGridSizer(0, 1, 10, 10);
IDC_NOWATERREF_CTRL =
new wxCheckBox(parent, -1, wxT("Don't draw water reflections - Large Framerate Improvement"));
@@ -471,7 +471,7 @@ static void createKeysControls(wxWindow *parent, wxSiz
{
wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1,
wxDefaultPosition, wxSize(480, 250));
- wxSizer *sizer = new wxFlexGridSizer(5, 1);
+ wxSizer *sizer = new wxFlexGridSizer(0, 5, 1, 0);
keyboardKeyList.clear();
if (!Keyboard::instance()->loadKeyFile())

82
games/scorched3d/patches/patch-src_launcher_wxdialogs_SettingsDialog_cpp Normal file
View File

@ -0,0 +1,82 @@
$OpenBSD: patch-src_launcher_wxdialogs_SettingsDialog_cpp,v 1.1 2019/01/02 12:44:07 jca Exp $
Patch from Debian:
From: Markus Koschany <apo@debian.org>
Date: Fri, 15 Jul 2016 18:01:36 +0200
Subject: wx3.0 compat
Make Scorched3D compatible with wxWidgets 3.0
Thanks to Olly Betts for the patch.
---
src/launcher/wxdialogs/Display.cpp | 10 +++++-----
src/launcher/wxdialogs/DisplayDialog.cpp | 10 +++++-----
src/launcher/wxdialogs/SettingsDialog.cpp | 14 +++++++-------
3 files changed, 17 insertions(+), 17 deletions(-)
Index: src/launcher/wxdialogs/SettingsDialog.cpp
--- src/launcher/wxdialogs/SettingsDialog.cpp.orig
+++ src/launcher/wxdialogs/SettingsDialog.cpp
@@ -105,7 +105,7 @@ void SettingsFrame::createMainPanel(bool server)
mainPanel_ = new wxPanel(book_, -1);
book_->AddPage(mainPanel_, wxT("Main"));
wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL);
- wxSizer *sizer = new wxFlexGridSizer(2, 2);
+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
mainPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
setters_.push_back(
@@ -166,7 +166,7 @@ void SettingsFrame::createMoneyPanel()
{
moneyPanel_ = new wxPanel(book_, -1);
wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
- wxSizer *sizer = new wxFlexGridSizer(2, 2);
+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
setters_.push_back(
@@ -215,7 +215,7 @@ void SettingsFrame::createScorePanel()
{
scorePanel_ = new wxPanel(book_, -1);
wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
- wxSizer *sizer = new wxFlexGridSizer(2, 2);
+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
setters_.push_back(
@@ -249,7 +249,7 @@ void SettingsFrame::createWeaponsPanel()
{
weaponsPanel_ = new wxPanel(book_, -1);
wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
- wxSizer *sizer = new wxFlexGridSizer(2, 2);
+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
setters_.push_back(
@@ -286,7 +286,7 @@ void SettingsFrame::createEnvPanel()
{
envPanel_ = new wxPanel(book_, -1);
wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL);
- wxSizer *sizer = new wxFlexGridSizer(2, 2);
+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
envPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
setters_.push_back(
@@ -337,7 +337,7 @@ void SettingsFrame::createLandPanel()
wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1,
wxDefaultPosition, wxSize(225, 200));
- wxSizer *sizer = new wxFlexGridSizer(3, 3);
+ wxSizer *sizer = new wxFlexGridSizer(0, 3, 3, 0);
int i = 0;
std::list<LandscapeDefinitionsEntry> &defns =
landscapeDefinitions.getAllLandscapes();
@@ -438,7 +438,7 @@ void SettingsFrame::createPlayersPanel()
wxT("Players are persistent for game"));
playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER | wxTOP, 10);
- wxSizer *sizer = new wxGridSizer(3, 3);
+ wxSizer *sizer = new wxGridSizer(0, 3, 3, 0);
playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
for (int i=0; i<24; i++)

14
games/scummvm-tools/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.33 2018/12/05 20:19:01 naddy Exp $
# $OpenBSD: Makefile,v 1.34 2019/01/02 12:44:07 jca Exp $
COMMENT= collection of various tools for scummvm
V= 2.0.0
REVISION= 2
REVISION= 3
DISTNAME= scummvm-tools-${V}
CATEGORIES= games
MASTER_SITES= http://www.scummvm.org/frs/scummvm-tools/${V}/
@ -14,12 +14,10 @@ MAINTAINER= Jonathan Gray <jsg@openbsd.org>
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c freetype iconv m ogg ${COMPILER_LIBCXX} z FLAC mad png pthread vorbis \
vorbisenc vorbisfile \
wx_base_net wx_base wx_base_odbc wx_base_xml \
wx_gtk2_adv wx_gtk2_aui wx_gtk2_core \
wx_gtk2_dbgrid wx_gtk2_html wx_gtk2_qa \
wx_gtk2_richtext wx_gtk2_xrc
WANTLIB += ${COMPILER_LIBCXX} FLAC c freetype iconv m mad ogg
WANTLIB += png16 vorbis vorbisenc vorbisfile wx_baseu-3.0 wx_baseu_net-3.0
WANTLIB += wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_core-3.0
WANTLIB += wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0 wx_gtk3u_xrc-3.0 z
NO_TEST= Yes
USE_GMAKE= Yes

32
geo/spatialite/gis/Makefile
View File

@ -1,28 +1,30 @@
# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:04 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2019/01/02 12:44:07 jca Exp $
COMMENT = minimalistic GIS on top of spatialite and rasterlite
PROJECT = spatialite_gis
DISTNAME = ${PROJECT}-1.0.0c
REVISION= 7
REVISION= 8
LIB_DEPENDS += print/libharu \
databases/sqlite3 \
x11/wxWidgets \
x11/wxWidgets>=3.0.4 \
geo/spatialite/libspatialite \
geo/spatialite/librasterlite
RUN_DEPENDS += devel/desktop-file-utils
WANTLIB += ICE SDL SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo
WANTLIB += expat ffi fontconfig freetype freexl gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += geos geos_c geotiff gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 gtk-x11-2.0 hpdf graphite2 harfbuzz iconv intl
WANTLIB += iodbc jpeg m mspack pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png proj pthread rasterlite
WANTLIB += sndio spatialite sqlite3 ${COMPILER_LIBCXX} tiff usbhid wx_base
WANTLIB += wx_base_net wx_base_odbc wx_base_xml wx_gtk2_adv wx_gtk2_aui
WANTLIB += wx_gtk2_core wx_gtk2_dbgrid wx_gtk2_html wx_gtk2_qa
WANTLIB += wx_gtk2_richtext wx_gtk2_xrc xcb xcb-render xcb-shm
WANTLIB += z lzma xml2
WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
WANTLIB += dbus-1 epoxy expat ffi fontconfig freetype freexl fribidi
WANTLIB += gdk-3 gdk_pixbuf-2.0 geos geos_c geotiff gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
WANTLIB += harfbuzz hpdf iconv intl jpeg lzma m mspack notify
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png16 proj rasterlite samplerate sndio spatialite sqlite3
WANTLIB += tiff usbhid wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0
WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0
WANTLIB += wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0 wx_gtk3u_xrc-3.0
WANTLIB += xcb xcb-render xcb-shm xml2 z
COMPILER = base-clang ports-gcc base-gcc

13
geo/spatialite/gis/patches/patch-Classdef_h Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-Classdef_h,v 1.1 2019/01/02 12:44:07 jca Exp $
Index: Classdef.h
--- Classdef.h.orig
+++ Classdef.h
@@ -30,6 +30,7 @@
#include "wx/spinctrl.h"
#include "wx/listctrl.h"
#include "wx/grid.h"
+#include "wx/graphics.h"
#ifdef SPATIALITE_AMALGAMATION
#include <spatialite/sqlite3.h>

25
geo/spatialite/gis/patches/patch-MapView_cpp Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-MapView_cpp,v 1.1 2019/01/02 12:44:07 jca Exp $
Index: MapView.cpp
--- MapView.cpp.orig
+++ MapView.cpp
@@ -1160,7 +1160,8 @@ void MyMapView::OnTimerIdentify(wxTimerEvent & WXUNUSE
if (layer->GetType() == VECTOR_LAYER)
{
if (layer->GetTableName() == active->GetTableName() &&
- layer->GetGeometryColumn() && active->GetGeometryColumn())
+ !layer->GetGeometryColumn().empty() &&
+ !active->GetGeometryColumn().empty())
{
// OK: performing Identify
Identify(layer, IdentifyMouseX, IdentifyMouseY);
@@ -1789,7 +1790,8 @@ void MyMapView::OnCmdIdentify(wxCommandEvent & WXUNUSE
if (layer->GetType() == VECTOR_LAYER)
{
if (layer->GetTableName() == active->GetTableName() &&
- layer->GetGeometryColumn() && active->GetGeometryColumn())
+ !layer->GetGeometryColumn().empty() &&
+ !active->GetGeometryColumn().empty())
{
// OK: performing Identify
Identify(layer, MouseIdentifyX, MouseIdentifyY);

14
geo/spatialite/gis/patches/patch-configure Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-configure,v 1.1 2019/01/02 12:44:07 jca Exp $
Index: configure
--- configure.orig
+++ configure
@@ -15380,7 +15380,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CXXFLAGS="$(wx-config --cxxflags)"
AM_CXXFLAGS="$(wx-config --cxxflags)"
-WX_LIBS="$(wx-config --libs)"
+WX_LIBS="$(wx-config --libs std,aui)"
# Checks for header files.

34
geo/spatialite/gui/Makefile
View File

@ -1,30 +1,34 @@
# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:04 sthen Exp $
# $OpenBSD: Makefile,v 1.13 2019/01/02 12:44:07 jca Exp $
COMMENT = GUI for spatialite
DISTNAME = spatialite_gui-1.7.1
REVISION = 6
REVISION = 7
LIB_DEPENDS += x11/wxWidgets \
LIB_DEPENDS += x11/wxWidgets>=3.0.4 \
databases/sqlite3 \
geo/spatialite/libspatialite \
geo/spatialite/libgaiagraphics
RUN_DEPENDS += devel/desktop-file-utils
WANTLIB += ICE SDL SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo expat ffi
WANTLIB += fontconfig freetype freexl gaiagraphics gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 geos geos_c geotiff gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0
WANTLIB += harfbuzz iconv intl iodbc jpeg lzma m mspack pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png proj pthread
WANTLIB += sndio spatialite sqlite3 ${COMPILER_LIBCXX} tiff usbhid wx_base
WANTLIB += wx_base_net wx_base_odbc wx_base_xml wx_gtk2_adv wx_gtk2_aui
WANTLIB += wx_gtk2_core wx_gtk2_dbgrid wx_gtk2_html wx_gtk2_qa
WANTLIB += wx_gtk2_richtext wx_gtk2_xrc xcb xcb-render xcb-shm xml2 z
WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
WANTLIB += dbus-1 epoxy expat ffi fontconfig freetype freexl fribidi
WANTLIB += gaiagraphics gdk-3 gdk_pixbuf-2.0 geos geos_c geotiff
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB += gthread-2.0 gtk-3 harfbuzz iconv intl jpeg lzma m mspack
WANTLIB += notify pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png16 proj samplerate sndio spatialite sqlite3 tiff
WANTLIB += usbhid wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0
WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0
WANTLIB += wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0 wx_gtk3u_xrc-3.0
WANTLIB += xcb xcb-render xcb-shm xml2 z
COMPILER = base-clang ports-gcc base-gcc
# so that it finds all libs without rpath..
CONFIGURE_ENV += LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{pixmaps,applications}

14
geo/spatialite/gui/patches/patch-configure Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-configure,v 1.1 2019/01/02 12:44:07 jca Exp $
Index: configure
--- configure.orig
+++ configure
@@ -15543,7 +15543,7 @@ if test x$WX_CONFIG == xnot_found; then
fi
CXXFLAGS="$(wx-config --cxxflags)"
AM_CXXFLAGS="$(wx-config --cxxflags)"
-WX_LIBS="$(wx-config --libs)"
+WX_LIBS="$(wx-config --libs std,aui)"
# Checks for header files.

31
geo/spatialite/librewms/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:04 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2019/01/02 12:44:07 jca Exp $
COMMENT = WMS viewer built on top of spatialite and rasterlite2
DISTNAME = librewms-1.0.0
REVISION = 7
REVISION = 8
# Licence: GPLv3
@ -11,18 +11,21 @@ LIB_DEPENDS += x11/wxWidgets \
geo/spatialite/libspatialite \
geo/spatialite/librasterlite2
RUN_DEPENDS += devel/desktop-file-utils
WANTLIB += ICE SDL SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo crypto curl
WANTLIB += expat ffi fontconfig freetype freexl gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 geos geos_c geotiff gif gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0
WANTLIB += harfbuzz iconv intl iodbc jpeg lzma m mspack nghttp2 pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png proj pthread
WANTLIB += rasterlite2 sndio spatialite sqlite3 ssl ${COMPILER_LIBCXX}
WANTLIB += tiff usbhid webp wx_base wx_base_net wx_base_odbc wx_base_xml
WANTLIB += wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid
WANTLIB += wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc xcb
WANTLIB += xcb-render xcb-shm xml2 z
WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
WANTLIB += crypto curl dbus-1 epoxy expat ffi fontconfig freetype
WANTLIB += freexl fribidi gdk-3 gdk_pixbuf-2.0 geos geos_c geotiff
WANTLIB += gif gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB += gthread-2.0 gtk-3 harfbuzz iconv intl jpeg lzma m mspack
WANTLIB += nghttp2 notify pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png16 proj rasterlite2 samplerate sndio
WANTLIB += spatialite sqlite3 ssl tiff usbhid webp wx_baseu-3.0
WANTLIB += wx_baseu_net-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0
WANTLIB += wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0 wx_gtk3u_html-3.0
WANTLIB += wx_gtk3u_qa-3.0 wx_gtk3u_xrc-3.0 xcb xcb-render xcb-shm
WANTLIB += xml2 z
COMPILER = base-clang ports-gcc base-gcc

14
geo/spatialite/librewms/patches/patch-configure Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-configure,v 1.1 2019/01/02 12:44:07 jca Exp $
Index: configure
--- configure.orig
+++ configure
@@ -15562,7 +15562,7 @@ if test x$WX_CONFIG == xnot_found; then
fi
CXXFLAGS="$(wx-config --cxxflags)"
AM_CXXFLAGS="$(wx-config --cxxflags)"
-WX_LIBS="$(wx-config --libs)"
+WX_LIBS="$(wx-config --libs std,aui)"
# Checks for header files.

13
graphics/delaboratory/Makefile
View File

@ -1,16 +1,17 @@
# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:05 sthen Exp $
# $OpenBSD: Makefile,v 1.13 2019/01/02 12:44:07 jca Exp $
COMMENT = color correction utility for digital images
DISTNAME = delaboratory-0.8
CATEGORIES = graphics x11
REVISION = 5
REVISION = 6
# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c iconv lzma m pthread ${COMPILER_LIBCXX} tiff wx_base wx_base_net wx_base_odbc
WANTLIB += wx_base_xml wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid
WANTLIB += wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc xml2 z
WANTLIB += ${COMPILER_LIBCXX} c iconv lzma m tiff wx_baseu-3.0
WANTLIB += wx_baseu_net-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0
WANTLIB += wx_gtk3u_core-3.0 wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0
WANTLIB += wx_gtk3u_xrc-3.0 xml2 z
COMPILER = base-clang ports-gcc base-gcc
@ -18,7 +19,7 @@ MASTER_SITES = https://distfiles.nl/
LIB_DEPENDS = converters/libiconv \
textproc/libxml \
x11/wxWidgets,-main
x11/wxWidgets,-main>=3.0.4
RUN_DEPENDS = graphics/dcraw

22
graphics/hugin/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.60 2018/12/13 19:53:24 sthen Exp $
# $OpenBSD: Makefile,v 1.61 2019/01/02 12:44:07 jca Exp $
BROKEN-hppa = run dep on enblend-enfuse which will not build on hppa
COMMENT = panorama image stitcher
DISTNAME = hugin-2016.2.0
REVISION = 5
REVISION = 6
EXTRACT_SUFX = .tar.bz2
# not needed for releases, but makes RCs/betas easier to work with
@ -30,15 +30,15 @@ MAINTAINER = Kirill Bychkov <kirby@openbsd.org>
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU Half Iex IlmImf IlmThread
WANTLIB += Imath X11 boost_filesystem-mt boost_system-mt c exiv2
WANTLIB += fftw3 jpeg lcms2 m pano13 png16 python2.7 sqlite3 tiff
WANTLIB += vigraimpex wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0
WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0
WANTLIB += wx_gtk3u_gl-3.0 wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0 wx_gtk3u_xrc-3.0
WANTLIB += z
# lensfun is dlopened, so don't remove it from WANTLIB and LIB_DEPENDS
WANTLIB += GL GLEW GLU Half Iex Imath IlmImf IlmThread X11
WANTLIB += boost_filesystem-mt boost_system-mt c exiv2 fftw3
WANTLIB += jpeg lcms2 lensfun m pano13>=3.0
WANTLIB += png pthread sqlite3 tiff vigraimpex wx_base>=3
WANTLIB += wx_base_net>=3 wx_base_xml>=3 wx_gtk2_adv>=3
WANTLIB += wx_gtk2_aui>=3 wx_gtk2_core>=3 wx_gtk2_gl>=3
WANTLIB += wx_gtk2_qa wx_gtk2_html>=3 wx_gtk2_xrc>=3 z ${MODPY_WANTLIB}
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += lensfun
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hugin/}
@ -59,7 +59,7 @@ LIB_DEPENDS = devel/boost>=1.58 \
graphics/libpano13>=2.9.19 \
graphics/lensfun \
graphics/vigra \
x11/wxWidgets>=2.8.12p7
x11/wxWidgets>=3.0.4
MODULES = devel/cmake lang/python
COMPILER = base-clang ports-gcc

3
graphics/sk1/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2018/07/16 19:50:36 rsadowski Exp $
# $OpenBSD: Makefile,v 1.2 2019/01/02 12:44:07 jca Exp $
COMMENT = multiplatform vector graphics editor
VERSION = 2.0rc3
DISTNAME = sk1-${VERSION}
REVISION = 0
CATEGORIES = graphics

17
lang/erlang/16/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2018/06/02 14:03:24 sthen Exp $
# $OpenBSD: Makefile,v 1.23 2019/01/02 12:44:07 jca Exp $
BROKEN-alpha= beam/erl_process.c:6692: internal compiler error: in final_scan_insn, at final.c:2449
@ -13,8 +13,8 @@ PKGNAME= erlang-$V
PKGNAME-main= erlang-16b.03
PKGNAME-wx= erlang-wx-16b.03
REVISION-main= 15
REVISION-wx= 3
REVISION-main= 16
REVISION-wx= 4
VERSION_SPEC= >=16v0,<17v0
PKGSPEC-main= erlang-${VERSION_SPEC}
@ -29,13 +29,14 @@ CONFIGURE_ARGS+=--without-jinterface \
MULTI_PACKAGES = -main -wx
WANTLIB = m pthread
WANTLIB-main = ${WANTLIB} c crypto ncurses util
WANTLIB-main = ${WANTLIB} c crypto curses util
WANTLIB-wx += ${WANTLIB} GL GLU ${COMPILER_LIBCXX} wx_base wx_base_xml wx_gtk2_adv
WANTLIB-wx += wx_gtk2_aui wx_gtk2_core wx_gtk2_gl wx_gtk2_html wx_gtk2_stc
WANTLIB-wx += wx_gtk2_xrc
WANTLIB-wx += ${WANTLIB} ${COMPILER_LIBCXX} GL GLU
WANTLIB-wx += wx_baseu-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0
WANTLIB-wx += wx_gtk3u_core-3.0 wx_gtk3u_gl-3.0 wx_gtk3u_html-3.0
WANTLIB-wx += wx_gtk3u_stc-3.0 wx_gtk3u_xrc-3.0
LIB_DEPENDS-wx +=x11/wxWidgets>=2.8.12p10
LIB_DEPENDS-wx +=x11/wxWidgets>=3.0.4
RUN_DEPENDS-wx =${BASE_PKGPATH},-main>=${MAJ_V}
DOC_DIR= ${PREFIX}/lib/erlang${MAJ_V}/

17
lang/erlang/17/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2018/06/02 14:03:24 sthen Exp $
# $OpenBSD: Makefile,v 1.23 2019/01/02 12:44:07 jca Exp $
BROKEN-alpha= beam/erl_process.c:6692: internal compiler error: in final_scan_insn, at final.c:2449
@ -13,8 +13,8 @@ PKGNAME= erlang-$V
PKGNAME-main= erlang-$V
PKGNAME-wx= erlang-wx-$V
REVISION-main= 11
REVISION-wx= 3
REVISION-main= 12
REVISION-wx= 4
VERSION_SPEC= >=17v0,<18v0
PKGSPEC-main= erlang-${VERSION_SPEC}
@ -31,13 +31,14 @@ CONFIGURE_ARGS+=--without-jinterface \
MULTI_PACKAGES = -main -wx
WANTLIB = m pthread
WANTLIB-main = ${WANTLIB} c crypto ncurses util
WANTLIB-main = ${WANTLIB} c crypto curses util
WANTLIB-wx += ${WANTLIB} GL GLU ${COMPILER_LIBCXX} wx_base wx_base_xml wx_gtk2_adv
WANTLIB-wx += wx_gtk2_aui wx_gtk2_core wx_gtk2_gl wx_gtk2_html wx_gtk2_stc
WANTLIB-wx += wx_gtk2_xrc
WANTLIB-wx += ${WANTLIB} GL GLU ${COMPILER_LIBCXX}
WANTLIB-wx += wx_baseu-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0
WANTLIB-wx += wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0 wx_gtk3u_gl-3.0
WANTLIB-wx += wx_gtk3u_html-3.0 wx_gtk3u_stc-3.0 wx_gtk3u_xrc-3.0
LIB_DEPENDS-wx +=x11/wxWidgets>=2.8.12p10
LIB_DEPENDS-wx +=x11/wxWidgets>=3.0.4
RUN_DEPENDS-wx =${BASE_PKGPATH},-main>=${MAJ_V}
DOC_DIR= ${PREFIX}/lib/erlang${MAJ_V}/

12
lang/erlang/18/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2018/11/17 13:40:05 jasper Exp $
# $OpenBSD: Makefile,v 1.20 2019/01/02 12:44:07 jca Exp $
BROKEN-alpha= beam/erl_process.c:6692: internal compiler error: in final_scan_insn, at final.c:2449
@ -12,6 +12,7 @@ DISTNAME= otp_src_$V
PKGNAME= erlang-$V
PKGNAME-main= erlang-$V
PKGNAME-wx= erlang-wx-$V
REVISION-wx= 0
VERSION_SPEC= >=18v0,<19v0
PKGSPEC-main= erlang-${VERSION_SPEC}
@ -30,11 +31,12 @@ MULTI_PACKAGES = -main -wx
WANTLIB = m pthread
WANTLIB-main = ${WANTLIB} c crypto kvm curses util
WANTLIB-wx += ${WANTLIB} GL GLU ${COMPILER_LIBCXX} wx_base wx_base_xml wx_gtk2_adv
WANTLIB-wx += wx_gtk2_aui wx_gtk2_core wx_gtk2_gl wx_gtk2_html wx_gtk2_stc
WANTLIB-wx += wx_gtk2_xrc
WANTLIB-wx += ${WANTLIB} ${COMPILER_LIBCXX} GL GLU
WANTLIB-wx += wx_baseu-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0
WANTLIB-wx += wx_gtk3u_core-3.0 wx_gtk3u_gl-3.0 wx_gtk3u_html-3.0
WANTLIB-wx += wx_gtk3u_stc-3.0 wx_gtk3u_xrc-3.0
LIB_DEPENDS-wx +=x11/wxWidgets>=2.8.12p10
LIB_DEPENDS-wx +=x11/wxWidgets>=3.0.4
RUN_DEPENDS-wx =${BASE_PKGPATH},-main>=${MAJ_V}
DOC_DIR= ${PREFIX}/lib/erlang${MAJ_V}/

17
lang/erlang/19/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2018/06/02 14:03:24 sthen Exp $
# $OpenBSD: Makefile,v 1.13 2019/01/02 12:44:07 jca Exp $
BROKEN-alpha= beam/erl_process.c:6692: internal compiler error: in final_scan_insn, at final.c:2449
@ -12,9 +12,9 @@ DISTNAME= otp_src_$V
PKGNAME= erlang-$V
PKGNAME-main= erlang-$V
PKGNAME-wx= erlang-wx-$V
REVISION-wx= 1
REVISION-main= 4
REVISION-main= 5
REVISION-wx= 2
VERSION_SPEC= >=19v0,<20v0
PKGSPEC-main= erlang-${VERSION_SPEC}
@ -31,13 +31,14 @@ CONFIGURE_ARGS+=--without-jinterface \
MULTI_PACKAGES = -main -wx
WANTLIB = m pthread
WANTLIB-main = ${WANTLIB} c crypto kvm ncurses util
WANTLIB-main = ${WANTLIB} c crypto kvm curses util
WANTLIB-wx += ${WANTLIB} GL GLU ${COMPILER_LIBCXX} wx_base wx_base_xml wx_gtk2_adv
WANTLIB-wx += wx_gtk2_aui wx_gtk2_core wx_gtk2_gl wx_gtk2_html wx_gtk2_stc
WANTLIB-wx += wx_gtk2_xrc
WANTLIB-wx += ${WANTLIB} GL GLU ${COMPILER_LIBCXX}
WANTLIB-wx += wx_baseu-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0
WANTLIB-wx += wx_gtk3u_core-3.0 wx_gtk3u_gl-3.0 wx_gtk3u_html-3.0
WANTLIB-wx += wx_gtk3u_stc-3.0 wx_gtk3u_xrc-3.0
LIB_DEPENDS-wx +=x11/wxWidgets>=2.8.12p10
LIB_DEPENDS-wx +=x11/wxWidgets>=3.0.4
RUN_DEPENDS-wx =${BASE_PKGPATH},-main>=${MAJ_V}
DOC_DIR= ${PREFIX}/lib/erlang${MAJ_V}/

10
lang/erlang/21/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2018/12/31 10:11:36 jasper Exp $
# $OpenBSD: Makefile,v 1.2 2019/01/02 12:44:07 jca Exp $
BROKEN-alpha= beam/erl_process.c:6692: internal compiler error: in final_scan_insn, at final.c:2449
@ -7,6 +7,7 @@ COMMENT-wx= WxWidgets bindings for Erlang
V= 21.2
MAJ_V= 21
REVISION= 0
EPOCH= 0
DISTNAME= otp_src_$V
PKGNAME= erlang-$V
@ -30,9 +31,10 @@ MULTI_PACKAGES = -main -wx
WANTLIB = m pthread
WANTLIB-main = ${WANTLIB} c crypto kvm curses util
WANTLIB-wx += ${WANTLIB} GL GLU ${COMPILER_LIBCXX} wx_base wx_base_xml wx_gtk2_adv
WANTLIB-wx += wx_gtk2_aui wx_gtk2_core wx_gtk2_gl wx_gtk2_html wx_gtk2_stc
WANTLIB-wx += wx_gtk2_xrc
WANTLIB-wx += ${WANTLIB} GL GLU ${COMPILER_LIBCXX}
WANTLIB-wx += wx_baseu-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0
WANTLIB-wx += wx_gtk3u_core-3.0 wx_gtk3u_gl-3.0 wx_gtk3u_html-3.0
WANTLIB-wx += wx_gtk3u_stc-3.0 wx_gtk3u_xrc-3.0
LIB_DEPENDS-wx +=x11/wxWidgets>=2.8.12p10
RUN_DEPENDS-wx =${BASE_PKGPATH},-main>=${MAJ_V}

15
misc/rocrail/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2018/10/29 19:22:25 naddy Exp $
# $OpenBSD: Makefile,v 1.18 2019/01/02 12:44:07 jca Exp $
COMMENT-main = model railroad control daemon
COMMENT-gui = model railroad control daemon client
@ -11,7 +11,7 @@ PKGNAME-gui = rocview-${VERSION}.${REV}
CATEGORIES = misc x11
REVISION-main = 8
REVISION-gui = 6
REVISION-gui = 7
HOMEPAGE = http://www.rocrail.net/
MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
@ -25,11 +25,12 @@ COMPILER = base-clang ports-gcc base-gcc
MULTI_PACKAGES = -main -gui
WANTLIB += c pthread
WANTLIB-gui += ${WANTLIB} m ${COMPILER_LIBCXX}
WANTLIB-gui += wx_base wx_base_net wx_base_odbc wx_base_xml wx_gtk2_adv
WANTLIB-gui += wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid wx_gtk2_html
WANTLIB-gui += wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc
LIB_DEPENDS-gui += x11/wxWidgets
WANTLIB-gui += ${WANTLIB} m ${COMPILER_LIBCXX}
WANTLIB-gui += wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0
WANTLIB-gui += wx_gtk3u_core-3.0 wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0
WANTLIB-gui += wx_gtk3u_xrc-3.0
LIB_DEPENDS-gui += x11/wxWidgets>=3.0.4
RUN_DEPENDS-gui += ${PKGPATH},-main
USE_GMAKE = Yes

23
multimedia/dvdstyler/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.41 2018/10/24 14:28:08 sthen Exp $
# $OpenBSD: Makefile,v 1.42 2019/01/02 12:44:07 jca Exp $
COMMENT= DVD authoring application
@ -7,23 +7,17 @@ PKGNAME= ${DISTNAME:L}
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
EXTRACT_SUFX= .tar.bz2
REVISION= 5
REVISION= 6
HOMEPAGE= https://www.dvdstyler.org/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ${COMPILER_LIBCXX} ICE ORBit-2 SM X11 Xcomposite Xcursor
WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2
WANTLIB += atk-1.0 avcodec avfilter avformat avutil bonobo-2 bonobo-activation
WANTLIB += bonoboui-2 c cairo dbus-1 exif fontconfig freetype
WANTLIB += gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gnome-2 gnomecanvas-2 gnomeui-2 gnomevfs-2
WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 intl jpeg m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 popt swscale wx_base wx_base_net
WANTLIB += wx_gtk2_adv wx_gtk2_core wx_gtk2_html wx_gtk2_media
WANTLIB += wxsvg z
WANTLIB += ${COMPILER_LIBCXX} avcodec avfilter avformat avutil
WANTLIB += c dbus-1 exif fontconfig freetype jpeg m swscale wx_baseu-3.0
WANTLIB += wx_baseu_net-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_core-3.0
WANTLIB += wx_gtk3u_html-3.0 wx_gtk3u_media-3.0 wxsvg z
COMPILER = base-clang ports-gcc base-gcc
@ -42,10 +36,9 @@ RUN_DEPENDS= devel/desktop-file-utils \
LIB_DEPENDS= graphics/ffmpeg \
graphics/libexif \
x11/gnome/libgnomeui \
x11/wxSVG \
x11/wxWidgets \
x11/wxWidgets,-media
x11/wxWidgets>=3.0.4 \
x11/wxWidgets,-media>=3.0.4
# FIXME: locale/Makefile uses gmake constructs
USE_GMAKE= Yes

16
multimedia/dvdstyler/patches/patch-wxVillaLib_thumb_md5_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-wxVillaLib_thumb_md5_cpp,v 1.1 2019/01/02 12:44:07 jca Exp $
Index: wxVillaLib/thumb_md5.cpp
--- wxVillaLib/thumb_md5.cpp.orig
+++ wxVillaLib/thumb_md5.cpp
@@ -307,9 +307,9 @@ const unsigned char acceptable[96] =
#define ACCEPTABLE_CHAR(a) ((a)>=32 && (a)<128 && (acceptable[(a)-32] & UNSAFE_PATH))
#endif
#define HEX_ESCAPE '%'
-const char hex[17] = "0123456789ABCDEF";
char* escape_string(const char *string)
{
+ static const char hex[] = "0123456789ABCDEF";
const char *p;
char *q;
char *result;

16
net/amule/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.68 2018/11/14 20:48:21 sthen Exp $
# $OpenBSD: Makefile,v 1.69 2019/01/02 12:44:07 jca Exp $
COMMENT-main = another eDonkey P2P file sharing client
COMMENT-web = webserver interface to amuled
@ -6,7 +6,7 @@ COMMENT-daemon =stand-alone daemon/cmdline for amule
V = 2.3.2
DISTNAME = aMule-$V
REVISION = 10
REVISION = 11
CATEGORIES = net
HOMEPAGE = http://www.amule.org/
@ -34,7 +34,7 @@ COMPILER = base-clang ports-gcc base-gcc
BUILD_DEPENDS = devel/bison \
devel/gettext-tools
commonLIB_DEPENDS = x11/wxWidgets>=2.8.12 \
commonLIB_DEPENDS = x11/wxWidgets>=3.0.4 \
net/libupnp>=1.6.6
LIB_DEPENDS-main = ${LIB_DEPENDS} ${commonLIB_DEPENDS} \
@ -53,14 +53,16 @@ RUN_DEPENDS-main = ${RUN_DEPENDS} \
devel/desktop-file-utils
commonWANTLIB = c ixml m pthread ${COMPILER_LIBCXX} threadutil upnp \
wx_base wx_base_net z
z wx_baseu-3.0 wx_baseu_net-3.0
WANTLIB-main = ${WANTLIB} ${commonWANTLIB} \
GeoIP X11 cryptopp fontconfig tiff webp \
freetype gd iconv jpeg png wx_gtk2_adv wx_gtk2_core
freetype gd iconv jpeg png16 wx_gtk3u_adv-3.0 wx_gtk3u_core-3.0
WANTLIB-daemon = ${WANTLIB} ${commonWANTLIB} \
cryptopp readline termcap
cryptopp readline
WANTLIB-web = ${WANTLIB} ${commonWANTLIB} \
iconv intl png readline termcap
iconv intl png16 readline
USE_GMAKE = Yes

32
x11/wxSVG/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.44 2018/10/24 14:28:13 sthen Exp $
# $OpenBSD: Makefile,v 1.45 2019/01/02 12:44:07 jca Exp $
COMMENT= C++ library to create, manipulate and render SVG files
@ -7,28 +7,28 @@ EPOCH= 0
CATEGORIES= x11 graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxsvg/}
EXTRACT_SUFX= .tar.bz2
REVISION= 0
REVISION= 1
SHARED_LIBS+= wxsvg 3.3
SHARED_LIBS+= wxsvg 4.0
HOMEPAGE= http://wxsvg.sourceforge.net/
# Modified LGPL
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ${COMPILER_LIBCXX} ICE SDL SM X11 Xcomposite Xcursor
WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += atk-1.0 avcodec avformat avutil bz2 c cairo crypto
WANTLIB += exif expat ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB += gsm gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl iodbc
WANTLIB += jpeg m mp3lame mspack ogg opus pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread fribidi
WANTLIB += ICE SDL2 SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 atk-bridge-2.0
WANTLIB += atspi avcodec avformat avutil bz2 c cairo cairo-gobject
WANTLIB += crypto dbus-1 epoxy exif expat ffi fontconfig freetype
WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 graphite2 gsm gthread-2.0 gtk-3 harfbuzz
WANTLIB += iconv intl jpeg m mp3lame mspack notify ogg opus pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png16 samplerate
WANTLIB += sndio speex ssl swresample swscale tiff usbhid vorbis
WANTLIB += vorbisenc vpx wx_base wx_base_net wx_base_odbc wx_base_xml
WANTLIB += wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid
WANTLIB += wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc
WANTLIB += x264 x265 xcb xcb-render xcb-shm xvidcore z
WANTLIB += vorbisenc vpx wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0
WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_core-3.0 wx_gtk3u_html-3.0
WANTLIB += wx_gtk3u_qa-3.0 wx_gtk3u_xrc-3.0 x264 x265 xcb xcb-render
WANTLIB += xcb-shm xvidcore z
# comes from multimedia/libvpx using lang/clang MODULE on i386|amd64 only
# which includes gcc4 MODULE with adds gcc-libs in dependency scope
@ -41,7 +41,7 @@ COMPILER = base-clang ports-gcc base-gcc
LIB_DEPENDS= graphics/cairo \
graphics/ffmpeg \
graphics/libexif \
x11/wxWidgets
x11/wxWidgets>=3.0.4
CONFIGURE_STYLE= gnu

13
x11/xchm/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:13 sthen Exp $
# $OpenBSD: Makefile,v 1.21 2019/01/02 12:44:07 jca Exp $
COMMENT= display chm files
DISTNAME= xchm-1.23
REVISION= 2
REVISION= 3
CATEGORIES= devel textproc x11
@ -15,13 +15,14 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xchm/}
LIB_DEPENDS= devel/chmlib \
x11/wxWidgets>=2.6.3
x11/wxWidgets>=3.0.4
RUN_DEPENDS= devel/desktop-file-utils
WANTLIB += m c ${COMPILER_LIBCXX} pthread chm wx_base_xml wx_gtk2_qa wx_base_odbc
WANTLIB += wx_gtk2_html wx_base wx_gtk2_adv wx_gtk2_xrc wx_gtk2_core
WANTLIB += wx_base_net wx_gtk2_dbgrid wx_gtk2_aui wx_gtk2_richtext
WANTLIB += ${COMPILER_LIBCXX} c chm m wx_baseu-3.0 wx_baseu_net-3.0
WANTLIB += wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0
WANTLIB += wx_gtk3u_core-3.0 wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0
WANTLIB += wx_gtk3u_xrc-3.0
COMPILER = base-clang ports-gcc base-gcc

23
x11/xchm/patches/patch-src_chmframe_cpp Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-src_chmframe_cpp,v 1.1 2019/01/02 12:44:07 jca Exp $
Index: src/chmframe.cpp
--- src/chmframe.cpp.orig
+++ src/chmframe.cpp
@@ -265,7 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEvent& WXUNUSED(
enu.EnumerateFacenames();
_normalFonts = new wxArrayString;
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+#if (wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7) || wxMAJOR_VERSION >= 3
*_normalFonts = enu.GetFacenames();
#else
*_normalFonts = *enu.GetFacenames();
@@ -278,7 +278,7 @@ void CHMFrame::OnChangeFonts(wxCommandEvent& WXUNUSED(
enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
_fixedFonts = new wxArrayString;
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+#if (wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7) || wxMAJOR_VERSION >= 3
*_fixedFonts = enu.GetFacenames();
#else
*_fixedFonts = *enu.GetFacenames();