mykola/opnsense-ports
1
0
Fork 0
forked from Lainports/opnsense-ports
Code Pull requests Activity

*/*: sync with upstream

Browse source 
Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2017-04-03 06:08:17 +02:00
parent 405b23c7c2
commit 31ce2a8a82
140 changed files with 1236 additions and 1542 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
archivers/libpar2/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= libpar2
PORTVERSION= 0.4
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= archivers
MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
@ -16,11 +16,9 @@ LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
USES= pkgconfig libtool
USES= pkgconfig libtool localbase compiler:c++11-lang
USE_CXXSTD= c++11
OPTIONS_DEFINE= DOCS

3
audio/gtkguitune/Makefile
View file

@ -16,7 +16,8 @@ LICENSE= GPLv2+
WRKSRC= ${WRKDIR}/${PORTNAME}
USES= pkgconfig
USES= compiler:c++11-lang pkgconfig
USE_CXXSTD= c++11
USE_GNOME= gtkmm24
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes

3
audio/pavucontrol/Makefile
View file

@ -15,8 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libpulse.so:audio/pulseaudio
GNU_CONFIGURE= yes
USES= gmake pkgconfig gettext tar:xz
USES= gmake pkgconfig gettext tar:xz compiler:c++11-lang
USE_GNOME= glibmm intltool libsigc++20
USE_CXXSTD= c++11
OPTIONS_SUB= yes
OPTIONS_SINGLE= GTK

2
audio/sooperlooper/Makefile
View file

@ -12,6 +12,8 @@ COMMENT= Live audio looping sampler
LICENSE= GPLv2
BROKEN= Does not build with newer libsigc++20
BUILD_DEPENDS= ladspa>0:audio/ladspa
LIB_DEPENDS= libjack.so:audio/jack \
liblo.so:audio/liblo \

1
benchmarks/flamegraph/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= flamegraph
PORTVERSION= g20170308
PORTREVISION= 1
CATEGORIES= benchmarks
MAINTAINER= jmd@FreeBSD.org

4
biology/diamond/Makefile
View file

@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= diamond
PORTVERSION= 0.8.36
PORTREVISION= 1
PORTVERSION= 0.8.37
PORTREVISION= 0
DISTVERSIONPREFIX=v
CATEGORIES= biology

6
biology/diamond/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1486907764
SHA256 (bbuchfink-diamond-v0.8.36_GH0.tar.gz) = 302336d88a791812c54c120d14332035fd2ba328932048fab0a13c26ffaf5a24
SIZE (bbuchfink-diamond-v0.8.36_GH0.tar.gz) = 342916
TIMESTAMP = 1491128175
SHA256 (bbuchfink-diamond-v0.8.37_GH0.tar.gz) = 54dcede91053075c7a530de6e4a842a65600b0d5d9eae4b6b4ceab402ac2c7fe
SIZE (bbuchfink-diamond-v0.8.37_GH0.tar.gz) = 353131

2
comms/svxlink/Makefile
View file

@ -10,6 +10,8 @@ COMMENT?= General purpose ham radio voice services
LICENSE= GPLv2
BROKEN= does not build since newer libsigc++20
LIB_DEPENDS?= libgsm.so:audio/gsm \
libspeex.so:audio/speex \
libgpg-error.so:security/libgpg-error \

3
databases/libgdamm5/Makefile
View file

@ -12,7 +12,8 @@ COMMENT= C++ wrapper for libgda5 library
BUILD_DEPENDS= gm4:devel/m4
USES= gmake libtool pathfix pkgconfig tar:xz
USES= gmake libtool pathfix pkgconfig tar:xz compiler:c++11-lang
USE_CXXSTD= c++11
USE_GNOME= libgda5 glibmm
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip

2
deskutils/pinot/Makefile
View file

@ -11,6 +11,8 @@ COMMENT= Personal search and metasearch for the Free Desktop
LICENSE= GPLv2
BROKEN= depends on C++11 libs while not itself being C++11 compatible
BUILD_DEPENDS= desktop-file-install:devel/desktop-file-utils \
update-mime-database:misc/shared-mime-info
LIB_DEPENDS= libxapian.so:databases/xapian-core \

3
devel/desktop-file-utils/Makefile
View file

@ -3,8 +3,7 @@
# $MCom: ports/trunk/devel/desktop-file-utils/Makefile 17268 2013-04-01 05:13:11Z marcus $
PORTNAME= desktop-file-utils
PORTVERSION= 0.22
PORTREVISION= 4
PORTVERSION= 0.23
CATEGORIES= devel
MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/releases/

5
devel/desktop-file-utils/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (desktop-file-utils-0.22.tar.xz) = 843532672692f98e9b2d6ae6cc8658da562dfde1606c7f33d9d227a344de56c5
SIZE (desktop-file-utils-0.22.tar.xz) = 131028
TIMESTAMP = 1491153510
SHA256 (desktop-file-utils-0.23.tar.xz) = 6c094031bdec46c9f621708f919084e1cb5294e2c5b1e4c883b3e70cb8903385
SIZE (desktop-file-utils-0.23.tar.xz) = 132000

1
devel/eris/Makefile
View file

@ -19,5 +19,6 @@ LIB_DEPENDS= libAtlas-0.6.so:devel/atlas-devel \
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USES= libtool pathfix pkgconfig compiler:c++11-lib
USE_CXXSTD= c++11
.include <bsd.port.mk>

4
devel/gconfmm26/Makefile
View file

@ -16,7 +16,9 @@ LIB_DEPENDS= libglibmm-2.4.so:devel/glibmm
BUILD_DEPENDS= gm4:devel/m4 \
${LOCALBASE}/lib/libgtkmm-2.4.so.1:x11-toolkits/gtkmm24
USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USES= compiler:c++11-lang gmake libtool:keepla pathfix pkgconfig \
tar:bzip2
USE_CXXSTD= c++11
USE_XORG= x11
USE_GNOME= gconf2 referencehack
GNU_CONFIGURE= yes

67
devel/glib20-reference/pkg-plist
View file

@ -131,6 +131,24 @@ share/doc/gio/GVolumeMonitor.html
share/doc/gio/GZlibCompressor.html
share/doc/gio/GZlibDecompressor.html
share/doc/gio/annotation-glossary.html
share/doc/gio/api-index-2-18.html
share/doc/gio/api-index-2-20.html
share/doc/gio/api-index-2-22.html
share/doc/gio/api-index-2-24.html
share/doc/gio/api-index-2-26.html
share/doc/gio/api-index-2-28.html
share/doc/gio/api-index-2-30.html
share/doc/gio/api-index-2-32.html
share/doc/gio/api-index-2-34.html
share/doc/gio/api-index-2-36.html
share/doc/gio/api-index-2-38.html
share/doc/gio/api-index-2-40.html
share/doc/gio/api-index-2-42.html
share/doc/gio/api-index-2-44.html
share/doc/gio/api-index-2-46.html
share/doc/gio/api-index-2-48.html
share/doc/gio/api-index-2-50.html
share/doc/gio/api-index-deprecated.html
share/doc/gio/api-index-full.html
share/doc/gio/application.html
share/doc/gio/async.html
@ -234,6 +252,32 @@ share/doc/gio/volume_mon.html
%%PORTDOCS%%%%DOCSDIR%%/Sorted_binary_tree_postorder.svg
%%PORTDOCS%%%%DOCSDIR%%/Sorted_binary_tree_preorder.svg
%%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-10.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-12.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-14.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-16.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-18.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-2.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-20.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-22.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-24.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-26.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-28.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-30.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-32.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-34.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-36.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-38.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-4.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-40.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-42.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-44.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-46.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-48.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-50.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-6.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-2-8.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-deprecated.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-full.html
%%PORTDOCS%%%%DOCSDIR%%/deprecated.html
%%PORTDOCS%%%%DOCSDIR%%/file-name-encodings.png
@ -263,7 +307,6 @@ share/doc/gio/volume_mon.html
%%PORTDOCS%%%%DOCSDIR%%/glib-File-Utilities.html
%%PORTDOCS%%%%DOCSDIR%%/glib-GDateTime.html
%%PORTDOCS%%%%DOCSDIR%%/glib-GTimeZone.html
%%PORTDOCS%%%%DOCSDIR%%/glib-GUuid.html
%%PORTDOCS%%%%DOCSDIR%%/glib-GVariant.html
%%PORTDOCS%%%%DOCSDIR%%/glib-GVariantType.html
%%PORTDOCS%%%%DOCSDIR%%/glib-Glob-style-pattern-matching.html
@ -343,6 +386,28 @@ share/doc/gobject/GBinding.html
share/doc/gobject/GTypeModule.html
share/doc/gobject/GTypePlugin.html
share/doc/gobject/annotation-glossary.html
share/doc/gobject/api-index-2-10.html
share/doc/gobject/api-index-2-12.html
share/doc/gobject/api-index-2-14.html
share/doc/gobject/api-index-2-18.html
share/doc/gobject/api-index-2-2.html
share/doc/gobject/api-index-2-22.html
share/doc/gobject/api-index-2-24.html
share/doc/gobject/api-index-2-26.html
share/doc/gobject/api-index-2-28.html
share/doc/gobject/api-index-2-30.html
share/doc/gobject/api-index-2-32.html
share/doc/gobject/api-index-2-34.html
share/doc/gobject/api-index-2-36.html
share/doc/gobject/api-index-2-38.html
share/doc/gobject/api-index-2-4.html
share/doc/gobject/api-index-2-40.html
share/doc/gobject/api-index-2-42.html
share/doc/gobject/api-index-2-44.html
share/doc/gobject/api-index-2-46.html
share/doc/gobject/api-index-2-6.html
share/doc/gobject/api-index-2-8.html
share/doc/gobject/api-index-deprecated.html
share/doc/gobject/api-index-full.html
share/doc/gobject/ch01s02.html
share/doc/gobject/chapter-gobject.html

4
devel/gnome-vfsmm/Makefile
View file

@ -14,7 +14,9 @@ COMMENT= C++ wrapper for gnomevfs2 library
BUILD_DEPENDS= gm4:devel/m4
USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2 \
compiler:c++11-lang
USE_CXXSTD= c++11
USE_GNOME= glibmm gnomevfs2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes

3
devel/gobject-introspection/Makefile
View file

@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= gobject-introspection
PORTVERSION= 1.52.0
PORTVERSION= 1.50.0
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3

6
devel/gobject-introspection/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1491086172
SHA256 (gnome3/gobject-introspection-1.52.0.tar.xz) = 9fc6d1ebce5ad98942cb21e2fe8dd67b722dcc01981840632a1b233f7d0e2c1e
SIZE (gnome3/gobject-introspection-1.52.0.tar.xz) = 1384432
TIMESTAMP = 1491127543
SHA256 (gnome3/gobject-introspection-1.50.0.tar.xz) = 1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5
SIZE (gnome3/gobject-introspection-1.50.0.tar.xz) = 1415700

3
devel/kf5-extra-cmake-modules/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= extra-cmake-modules
PORTVERSION= ${KDE_FRAMEWORKS_VERSION}
PORTREVISION= 1
CATEGORIES= devel kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING-CMAKE-SCRIPTS
USES= cmake:outsource kde:5 tar:xz
USE_QT5= #
DOCS_USE= QT5=help
DOCS_USE= QT5=help_build # qt5-help is only used to build a .qch file.
TEST_USE= QT5=buildtools_build,linguisttools_build,qmake_build
NO_ARCH= yes

3
devel/libbonobo/Makefile
View file

@ -3,8 +3,7 @@
# $MCom: ports/trunk/devel/libbonobo/Makefile 18393 2013-04-26 21:23:07Z kwm $
PORTNAME= libbonobo
PORTVERSION= 2.32.0
PORTREVISION?= 3
PORTVERSION= 2.32.1
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2

5
devel/libbonobo/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (gnome2/libbonobo-2.32.0.tar.bz2) = b8b8037d5e8e37f39395a2a2fba7f2fb3d5b53ecedc3d419181912b831ab1349
SIZE (gnome2/libbonobo-2.32.0.tar.bz2) = 1373333
TIMESTAMP = 1491153658
SHA256 (gnome2/libbonobo-2.32.1.tar.bz2) = 9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b
SIZE (gnome2/libbonobo-2.32.1.tar.bz2) = 1377716

1
devel/libbonobo/pkg-plist
View file

@ -175,6 +175,7 @@ share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo
share/locale/te/LC_MESSAGES/libbonobo-2.0.mo
share/locale/th/LC_MESSAGES/libbonobo-2.0.mo
share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ug/LC_MESSAGES/libbonobo-2.0.mo
share/locale/uk/LC_MESSAGES/libbonobo-2.0.mo
share/locale/vi/LC_MESSAGES/libbonobo-2.0.mo
share/locale/wa/LC_MESSAGES/libbonobo-2.0.mo

4
devel/libglademm24/Makefile
View file

@ -18,7 +18,9 @@ LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24
BUILD_DEPENDS= gm4:devel/m4
USE_XORG= x11 ice
USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USES= compiler:c++11-lang gmake libtool:keepla pathfix pkgconfig \
tar:bzip2
USE_CXXSTD= c++11
USE_GNOME= libglade2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes

2
devel/libreadline-java/Makefile
View file

@ -4,7 +4,7 @@
PORTNAME= libreadline-java
PORTVERSION= 0.8.0
DISTVERSIONSUFFIX= -src
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= devel java
MASTER_SITES= SF/java-readline/java-readline/${PORTVERSION}

36
devel/libreadline-java/files/patch-src_native_org__gnu__readline__Readline.c
View file

@ -1,6 +1,6 @@
--- src/native/org_gnu_readline_Readline.c.orig 2003-01-07 10:14:35 UTC
--- src/native/org_gnu_readline_Readline.c.orig 2017-04-02 09:52:09 UTC
+++ src/native/org_gnu_readline_Readline.c
@@ -430,7 +430,7 @@ const char *java_completer(char *text, i
@@ -430,7 +430,7 @@ const char *java_completer(char *text, int state) {
jtext = (*jniEnv)->NewStringUTF(jniEnv,text);
if (jniMethodId == 0) {
@ -9,10 +9,26 @@
}
completion = (*jniEnv)->CallObjectMethod(jniEnv, jniObject,
@@ -560,6 +560,21 @@ JNIEXPORT void JNICALL
#endif
/* -------------------------------------------------------------------------- */
@@ -472,11 +472,7 @@ JNIEXPORT void JNICALL Java_org_gnu_readline_Readline_
rl_completion_entry_function = NULL;
return;
}
-#ifdef JavaEditline
- rl_completion_entry_function = (CPFunction *) java_completer;
-#else
rl_completion_entry_function = (rl_compentry_func_t *) java_completer;
-#endif
}
else {
rl_completion_entry_function = NULL;
@@ -556,6 +552,21 @@ JNIEXPORT void JNICALL
return;
}
rl_completer_word_break_characters = word_break_buffer;
+}
+#endif
+
+/* -------------------------------------------------------------------------- */
+/* Sets/gets rl_completion_append_character */
+/* -------------------------------------------------------------------------- */
+
@ -24,10 +40,6 @@
+
+ rl_completion_append_character = (int)appendCharacter;
+ return (jchar)previous_setting;
+}
+#endif
+
+/* -------------------------------------------------------------------------- */
/* Convert utf8-string to ucs1-string . */
/* -------------------------------------------------------------------------- */
}
#endif

1
devel/libwfut/Makefile
View file

@ -16,6 +16,7 @@ LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \
CONFIGURE_ARGS+=--without-python
GNU_CONFIGURE= yes
USES= libtool pathfix pkgconfig compiler:c++11-lib
USE_CXXSTD= c++11
USE_LDCONFIG= yes
post-patch:

3
devel/obby/Makefile
View file

@ -15,7 +15,8 @@ LICENSE= GPLv2
LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \
libnet6.so:net/net6
USES= pathfix pkgconfig libtool
USES= pathfix pkgconfig libtool compiler:c++11-lang
USE_CXXSTD= c++11
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip

4
devel/py-gdbgui/Makefile
View file

@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= gdbgui
PORTVERSION= 0.7.4.0
PORTVERSION= 0.7.5.4
DISTVERSIONPREFIX= pyPI-
CATEGORIES= devel lang python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -19,7 +20,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.12:www/py-flask \
USE_GITHUB= yes
GH_ACCOUNT= cs01
GH_TAGNAME= f4c605b
USES= python
USE_PYTHON= autoplist distutils
NO_ARCH= yes

6
devel/py-gdbgui/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1488399199
SHA256 (cs01-gdbgui-0.7.4.0-f4c605b_GH0.tar.gz) = d3fa1b6869bfae1cdf78b5ada6e02b3fc9bfd00f664c8de56d9c404d41e414d7
SIZE (cs01-gdbgui-0.7.4.0-f4c605b_GH0.tar.gz) = 1327065
TIMESTAMP = 1490886725
SHA256 (cs01-gdbgui-pyPI-0.7.5.4_GH0.tar.gz) = 0f1da6a7947fb7e209e34d318799be2aa1c24932d5a36336bc15d603e42bd31b
SIZE (cs01-gdbgui-pyPI-0.7.5.4_GH0.tar.gz) = 1333587

4
devel/py-pygdbmi/Makefile
View file

@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= pygdbmi
PORTVERSION= 0.7.3.1
PORTVERSION= 0.7.3.3
DISTVERSIONPREFIX= pyPI-
CATEGORIES= devel lang python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -13,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
GH_ACCOUNT= cs01
GH_TAGNAME= ee66ea5
USES= python
USE_PYTHON= autoplist distutils

6
devel/py-pygdbmi/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1488405102
SHA256 (cs01-pygdbmi-0.7.3.1-ee66ea5_GH0.tar.gz) = c66f3ebfcc3991a4ba433e5807e2a1895b0b59272676b46ca3de1d6934ac9caa
SIZE (cs01-pygdbmi-0.7.3.1-ee66ea5_GH0.tar.gz) = 15309
TIMESTAMP = 1490886768
SHA256 (cs01-pygdbmi-pyPI-0.7.3.3_GH0.tar.gz) = d6079280b53a62ea90f713af26ee09982d22cc3dbe2e749441efac7bbd587778
SIZE (cs01-pygdbmi-pyPI-0.7.3.3_GH0.tar.gz) = 16201

2
devel/py-python-engineio/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= python-engineio
PORTVERSION= 1.2.3
PORTVERSION= 1.3.1
CATEGORIES= devel python net
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
devel/py-python-engineio/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1488408338
SHA256 (python-engineio-1.2.3.tar.gz) = 9048c8a26812d0f1d513ebd9fe257eca1097762094600319856dcc1d4cc92db6
SIZE (python-engineio-1.2.3.tar.gz) = 19352
TIMESTAMP = 1490875740
SHA256 (python-engineio-1.3.1.tar.gz) = cfb9f11d459e8d08e924c376737019dd5967cb1a7ec48611e25b69a948dba2a7
SIZE (python-engineio-1.3.1.tar.gz) = 19464

2
devel/py-python-socketio/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= python-socketio
PORTVERSION= 1.7.1
PORTVERSION= 1.7.4
CATEGORIES= devel python net
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
devel/py-python-socketio/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1488409587
SHA256 (python-socketio-1.7.1.tar.gz) = d9b3c2ffe23705fa651482c1d45e55561283649686a80d3ffd9ed695de21e2fa
SIZE (python-socketio-1.7.1.tar.gz) = 23252
TIMESTAMP = 1490875718
SHA256 (python-socketio-1.7.4.tar.gz) = 9200ee48aec8673027fdc40b0391aa2d681ff994d93b738ebd9f0d29916f24c4
SIZE (python-socketio-1.7.4.tar.gz) = 23298

3
devel/synfig/Makefile
View file

@ -24,7 +24,8 @@ LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \
libavcodec.so:multimedia/ffmpeg \
libdv.so:multimedia/libdv
USES= iconv jpeg libtool pathfix pkgconfig
USES= compiler:c++11-lang iconv jpeg libtool pathfix pkgconfig
USE_CXXSTD= c++11
USE_GNOME= cairo glibmm libxml++26
GNU_CONFIGURE= yes
CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG}

33
devel/synfig/files/patch-src__synfig__main.cpp
View file

@ -1,6 +1,6 @@
--- src/synfig/main.cpp.orig 2015-03-28 10:15:01 UTC
--- src/synfig/main.cpp.orig 2017-04-02 22:19:06 UTC
+++ src/synfig/main.cpp
@@ -198,7 +198,7 @@ synfig::Main::Main(const synfig::String&
@@ -198,7 +198,7 @@ synfig::Main::Main(const synfig::String& basepath,Prog
unsigned int i;
#ifdef _DEBUG
@ -9,7 +9,30 @@
std::set_terminate(__gnu_cxx::__verbose_terminate_handler);
#endif
#endif
@@ -490,7 +490,11 @@ synfig::get_binary_path(const String &fa
@@ -289,17 +289,17 @@ synfig::Main::Main(const synfig::String& basepath,Prog
locations.push_back(getenv("SYNFIG_MODULE_LIST"));
else
{
- locations.push_back("./"MODULE_LIST_FILENAME);
+ locations.push_back("./" MODULE_LIST_FILENAME);
if(getenv("HOME"))
locations.push_back(strprintf("%s/.local/share/synfig/%s", getenv("HOME"), MODULE_LIST_FILENAME));
#ifdef SYSCONFDIR
- locations.push_back(SYSCONFDIR"/"MODULE_LIST_FILENAME);
+ locations.push_back(SYSCONFDIR "/" MODULE_LIST_FILENAME);
#endif
locations.push_back(prefix+ETL_DIRECTORY_SEPARATOR+"etc"+ETL_DIRECTORY_SEPARATOR+MODULE_LIST_FILENAME);
- locations.push_back("/usr/local/etc/"MODULE_LIST_FILENAME);
+ locations.push_back("/usr/local/etc/" MODULE_LIST_FILENAME);
#ifdef __APPLE__
- locations.push_back("/Library/Frameworks/synfig.framework/Resources/"MODULE_LIST_FILENAME);
- locations.push_back("/Library/Synfig/"MODULE_LIST_FILENAME);
+ locations.push_back("/Library/Frameworks/synfig.framework/Resources/" MODULE_LIST_FILENAME);
+ locations.push_back("/Library/Synfig/" MODULE_LIST_FILENAME);
if(getenv("HOME"))
locations.push_back(strprintf("%s/Library/Synfig/%s", getenv("HOME"), MODULE_LIST_FILENAME));
#endif
@@ -490,7 +490,11 @@ synfig::get_binary_path(const String &fallback_path)
/* Read from /proc/self/exe (symlink) */
char* path2 = (char*)malloc(buf_size);
@ -21,7 +44,7 @@
while (1) {
int i;
@@ -524,9 +528,10 @@ synfig::get_binary_path(const String &fa
@@ -524,9 +528,10 @@ synfig::get_binary_path(const String &fallback_path)
/* path is a symlink. Continue loop and resolve this. */
strncpy(path, path2, buf_size - 1);
}
@ -33,7 +56,7 @@
if (result == "")
{
/* readlink() or stat() failed; this can happen when the program is
@@ -568,6 +573,7 @@ synfig::get_binary_path(const String &fa
@@ -568,6 +573,7 @@ synfig::get_binary_path(const String &fallback_path)
free(line);
fclose(f);
}

2
editors/vanubi/Makefile
View file

@ -4,7 +4,7 @@
PORTNAME= vanubi
PORTVERSION= 0.0.16
DISTVERSIONPREFIX= v
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= editors
MAINTAINER= ports@FreeBSD.org

17
editors/vanubi/files/patch-gui_main.vala Normal file
View file

@ -0,0 +1,17 @@
--- gui/main.vala.orig 2015-07-03 10:10:29 UTC
+++ gui/main.vala
@@ -35,12 +35,12 @@ namespace Vanubi.UI {
{ null }
};
- static Regex file_pos_regex = null;
+ static GLib.Regex file_pos_regex = null;
static construct {
try {
var file_pos = """^(?<f>.+?)(?::(?<sl>\d+)(?::(?<sc>\d+))?)?$""";
- file_pos_regex = new Regex (file_pos, RegexCompileFlags.CASELESS|RegexCompileFlags.OPTIMIZE);
+ file_pos_regex = new GLib.Regex (file_pos, GLib.RegexCompileFlags.CASELESS|GLib.RegexCompileFlags.OPTIMIZE);
} catch (Error e) {
error (e.message);
}

23
editors/vanubi/files/patch-gui_searchbar.vala Normal file
View file

@ -0,0 +1,23 @@
--- gui/searchbar.vala.orig 2015-07-03 10:10:29 UTC
+++ gui/searchbar.vala
@@ -153,11 +153,11 @@ namespace Vanubi.UI {
// do not parse in case of any error during parsing or evaluating the expression
}
- Regex regex = null;
+ GLib.Regex regex = null;
if (is_regex) {
try {
state.status.clear ("search");
- regex = new Regex (p, RegexCompileFlags.OPTIMIZE, RegexMatchFlags.ANCHORED);
+ regex = new GLib.Regex (p, GLib.RegexCompileFlags.OPTIMIZE, GLib.RegexMatchFlags.ANCHORED);
} catch (Error e) {
// user still writing regex, display an error
state.status.set (e.message, "search", Status.Type.ERROR);
@@ -381,4 +381,4 @@ namespace Vanubi.UI {
return base.on_key_press_event (e);
}
}
-}
\ No newline at end of file
+}

40
editors/vanubi/files/patch-gui_shellbar.vala
View file

@ -1,7 +1,32 @@
Add support of vte-2.91 instead of vte-2.90
--- gui/shellbar.vala.orig 2014-12-09 10:52:31 UTC
--- gui/shellbar.vala.orig 2015-07-03 10:10:29 UTC
+++ gui/shellbar.vala
@@ -29,8 +29,8 @@ namespace Vanubi.UI {
Cancellable pty_cancellable;
bool is_first_line = true;
- static Regex error_regex = null;
- static Regex dir_regex = null;
+ static GLib.Regex error_regex = null;
+ static GLib.Regex dir_regex = null;
static construct {
try {
@@ -44,11 +44,11 @@ namespace Vanubi.UI {
var php_error = """^(?<msg>.+)error:.* in (?<f>.+) on line (?<sl>\d+)\s*$""";
// sh style
var sh_error = """^(?<f>.+?):.*?(?<sl>\d+?):.*?:(?<msg>.*? error):""";
- error_regex = new Regex (@"(?:$(vala_error))|(?:$(php_error))|(?:$(c_error))|(?:$(sh_error))|(?:$(java_error))", RegexCompileFlags.CASELESS|RegexCompileFlags.OPTIMIZE|RegexCompileFlags.DUPNAMES);
+ error_regex = new GLib.Regex (@"(?:$(vala_error))|(?:$(php_error))|(?:$(c_error))|(?:$(sh_error))|(?:$(java_error))", GLib.RegexCompileFlags.CASELESS|GLib.RegexCompileFlags.OPTIMIZE|GLib.RegexCompileFlags.DUPNAMES);
// enter directory
var make_dir = """^.*Entering directory `(.+?)'.*$""";
- dir_regex = new Regex (@"(?:$(make_dir))", RegexCompileFlags.CASELESS|RegexCompileFlags.OPTIMIZE|RegexCompileFlags.DUPNAMES);
+ dir_regex = new GLib.Regex (@"(?:$(make_dir))", GLib.RegexCompileFlags.CASELESS|GLib.RegexCompileFlags.OPTIMIZE|GLib.RegexCompileFlags.DUPNAMES);
} catch (Error e) {
error (e.message);
}
@@ -146,10 +146,10 @@ namespace Vanubi.UI {
}
@ -15,3 +40,16 @@ Add support of vte-2.91 instead of vte-2.90
mouse_match (term, """^.+error:""");
mouse_match (term, """^.+warning:""");
@@ -255,10 +255,10 @@ namespace Vanubi.UI {
private void mouse_match (Terminal t, string str) {
try {
- var regex = new Regex (str);
+ var regex = new GLib.Regex (str);
int id = t.match_add_gregex (regex, 0);
t.match_set_cursor_type (id, Gdk.CursorType.HAND2);
- } catch (RegexError e) {
+ } catch (GLib.RegexError e) {
warning (e.message);
}
}

16
editors/vanubi/files/patch-libvanubi_completion.vala Normal file
View file

@ -0,0 +1,16 @@
--- libvanubi/completion.vala.orig 2015-07-03 10:10:29 UTC
+++ libvanubi/completion.vala
@@ -21,11 +21,11 @@ namespace Vanubi {
public class AbbrevCompletion {
LRU<string> lru = new LRU<string> (strcmp);
Annotated<string>[] tags = null;
- Regex regex;
+ GLib.Regex regex;
public AbbrevCompletion () {
try {
- regex = new Regex ("\\w+", RegexCompileFlags.MULTILINE | RegexCompileFlags.OPTIMIZE);
+ regex = new GLib.Regex ("\\w+", GLib.RegexCompileFlags.MULTILINE | GLib.RegexCompileFlags.OPTIMIZE);
} catch (Error e) {
warning (e.message);
}

17
editors/vanubi/files/patch-libvanubi_git.vala Normal file
View file

@ -0,0 +1,17 @@
--- libvanubi/git.vala.orig 2015-07-03 10:10:29 UTC
+++ libvanubi/git.vala
@@ -27,12 +27,12 @@ namespace Vanubi {
public class Git {
unowned Configuration config;
- static Regex hunk_regex;
+ static GLib.Regex hunk_regex;
static HashTable<DataSource, bool> monitored = new HashTable<DataSource, bool> (DataSource.hash, DataSource.equal);
static construct {
try {
- hunk_regex = new Regex ("^@@ -(\\d+),?(\\d*) \\+(\\d+),?(\\d*) @@");
+ hunk_regex = new GLib.Regex ("^@@ -(\\d+),?(\\d*) \\+(\\d+),?(\\d*) @@");
} catch (Error e) {
warning (e.message);
}

37
editors/vanubi/files/patch-libvanubi_util.vala Normal file
View file

@ -0,0 +1,37 @@
--- libvanubi/util.vala.orig 2015-07-03 10:10:29 UTC
+++ libvanubi/util.vala
@@ -35,12 +35,12 @@ namespace Vanubi {
public int end_line;
public int end_column;
- static Regex file_pos_regex = null;
+ static GLib.Regex file_pos_regex = null;
static construct {
try {
var file_pos = """^(?<f>.+?)(?::(?<sl>\d+)(?::(?<sc>\d+))?)?$""";
- file_pos_regex = new Regex (file_pos, RegexCompileFlags.CASELESS|RegexCompileFlags.OPTIMIZE);
+ file_pos_regex = new GLib.Regex (file_pos, GLib.RegexCompileFlags.CASELESS|GLib.RegexCompileFlags.OPTIMIZE);
} catch (Error e) {
error (e.message);
}
@@ -181,15 +181,15 @@ namespace Vanubi {
public async extern void spawn_async_with_pipes (string? working_directory, [CCode (array_length = false, array_null_terminated = true)] string[] argv, [CCode (array_length = false, array_null_terminated = true)] string[]? envp, SpawnFlags _flags, SpawnChildSetupFunc? child_setup, int io_priority, Cancellable? cancellable, out Pid child_pid, out int standard_input = null, out int standard_output = null, out int standard_error = null) throws SpawnError;
- static Regex update_copyright_year_regex1 = null;
- static Regex update_copyright_year_regex2 = null;
+ static GLib.Regex update_copyright_year_regex1 = null;
+ static GLib.Regex update_copyright_year_regex2 = null;
// Returns true if any copyright year has been replaced
public bool update_copyright_year (Buffer buf) {
if (update_copyright_year_regex1 == null || update_copyright_year_regex2 == null) {
try {
- update_copyright_year_regex1 = new Regex ("Copyright.*\\d\\d\\d\\d-(\\d\\d\\d\\d)", RegexCompileFlags.OPTIMIZE | RegexCompileFlags.CASELESS);
- update_copyright_year_regex2 = new Regex ("Copyright.*(\\d\\d\\d\\d)", RegexCompileFlags.OPTIMIZE | RegexCompileFlags.CASELESS);
+ update_copyright_year_regex1 = new GLib.Regex ("Copyright.*\\d\\d\\d\\d-(\\d\\d\\d\\d)", GLib.RegexCompileFlags.OPTIMIZE | GLib.RegexCompileFlags.CASELESS);
+ update_copyright_year_regex2 = new GLib.Regex ("Copyright.*(\\d\\d\\d\\d)", GLib.RegexCompileFlags.OPTIMIZE | GLib.RegexCompileFlags.CASELESS);
} catch (Error e) {
warning (e.message);
return false;

2
emulators/winetricks/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= winetricks
PORTVERSION= 20170326
PORTVERSION= 20170327
CATEGORIES= emulators
MAINTAINER= lifanov@FreeBSD.org

6
emulators/winetricks/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1490624935
SHA256 (Winetricks-winetricks-20170326_GH0.tar.gz) = 77fcae75f4198bd0819cbf331f1a0b5a0deee501c7c8f3f9e25417eac7e01dc7
SIZE (Winetricks-winetricks-20170326_GH0.tar.gz) = 191605
TIMESTAMP = 1491170702
SHA256 (Winetricks-winetricks-20170327_GH0.tar.gz) = ad381386be95f5f2c34a69a6d1d77f3d41d86f883b8bed7ac4699947cf13e97d
SIZE (Winetricks-winetricks-20170327_GH0.tar.gz) = 190864

4
finance/libofx/Makefile
View file

@ -16,7 +16,9 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
libxml++-2.6.so:textproc/libxml++26 \
libosp.so:textproc/opensp
USES= gettext-runtime gmake iconv libtool localbase pathfix pkgconfig
USES= gettext-runtime gmake iconv libtool localbase pathfix pkgconfig \
compiler:c++11-lang
USE_CXXSTD= c++11
USE_GNOME= glib20 glibmm libsigc++20 libxml2
CONFIGURE_ARGS= --disable-doxygen --disable-dot --disable-gengetopt \
--with-opensp-includes=${LOCALBASE}/include/OpenSP \

3
games/pink-pony/Makefile
View file

@ -21,7 +21,8 @@ LIB_DEPENDS= libIL.so:graphics/devil \
USE_GITHUB= yes
GH_ACCOUNT= ginkgo
USES= pkgconfig scons
USES= pkgconfig scons compiler:c++11-lang
USE_CXXSTD= c++11
USE_GL= gl glu
USE_SDL= mixer
SUB_FILES= pink-pony.sh

3
graphics/cairomm/Makefile
View file

@ -15,7 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USES= gmake libtool pathfix pkgconfig
USES= gmake libtool pathfix pkgconfig compiler:c++11-lang
USE_CXXSTD= c++11
USE_GNOME= cairo libxml++26
CONFIGURE_ENV= AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}"
CPPFLAGS+= -I${LOCALBASE}/include

4
graphics/cluttermm/Makefile
View file

@ -14,7 +14,9 @@ COMMENT= C++ interfaces for clutter
LIB_DEPENDS= libclutter-1.0.so:graphics/clutter
USES+= gettext gmake libtool pathfix perl5 pkgconfig tar:xz
USES+= gettext gmake libtool pathfix perl5 pkgconfig tar:xz \
compiler:c++11-lang
USE_CXXSTD= c++11
USE_GNOME= atkmm glib20 gtkmm30 libsigc++20 pangomm
GNU_CONFIGURE= yes
USE_LDCONFIG= yes

3
graphics/goocanvasmm2/Makefile
View file

@ -14,7 +14,8 @@ COMMENT= C++ bindings for the goocanvas widget for GTK
LIB_DEPENDS= libgoocanvas-2.0.so:graphics/goocanvas2
USES= gmake libtool pathfix pkgconfig tar:xz
USES= compiler:c++11-lang gmake libtool pathfix pkgconfig tar:xz
USE_CXXSTD= c++11
USE_GNOME= gtkmm30
GNU_CONFIGURE= yes
USE_LDCONFIG= yes

2
graphics/py-cairocffi/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= cairocffi
PORTVERSION= 0.8.0
PORTREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -17,5 +18,6 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
USES= python:2+
USE_PYTHON= autoplist distutils cffi
USE_GNOME= cairo
.include <bsd.port.mk>

5
graphics/rawtherapee-devel/Makefile
View file

@ -117,11 +117,6 @@ USES+= compiler:gcc-c++11-lib
.include <bsd.port.pre.mk>
.if ${CHOSEN_COMPILER_TYPE} == gcc
# Workaround: this needs to be late because Mk/Uses/compiler.mk tramples
# over previously set values with gcc-libc++-configure as of r432539.
# GCC 4.9 doesn't generate usable code on FreeBSD 11.0.
USE_GCC= 5+
# work around compiler faults
.if ${ARCH} == i386
CFLAGS+= -mstackrealign

5
graphics/rawtherapee/Makefile
View file

@ -116,11 +116,6 @@ USES+= compiler:gcc-c++11-lib
.include <bsd.port.pre.mk>
.if ${CHOSEN_COMPILER_TYPE} == gcc
# Workaround: this needs to be late because Mk/Uses/compiler.mk tramples
# over previously set values with gcc-libc++-configure as of r432539.
# GCC 4.9 doesn't generate usable code on FreeBSD 11.0.
USE_GCC= 5+
# work around compiler faults
.if ${ARCH} == i386
CFLAGS+= -mstackrealign

4
graphics/synfigstudio/Makefile
View file

@ -15,7 +15,9 @@ BUILD_DEPENDS= etl>=0.04.19_1:devel/etl
LIB_DEPENDS= libsynfig.so:devel/synfig
RUN_DEPENDS= xdg-open:devel/xdg-utils
USES= desktop-file-utils gmake libtool pathfix pkgconfig shared-mime-info
USES= compiler:c++11-lang desktop-file-utils gmake libtool pathfix \
pkgconfig shared-mime-info
USE_CXXSTD= c++11
USE_GNOME= gtkmm30 intltool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-update-mimedb

11
graphics/synfigstudio/files/patch-src_gui_dialogs_about.cpp Normal file
View file

@ -0,0 +1,11 @@
--- src/gui/dialogs/about.cpp.orig 2017-04-02 22:45:26 UTC
+++ src/gui/dialogs/about.cpp
@@ -204,7 +204,7 @@ About::About()
imagepath+=ETL_DIRECTORY_SEPARATOR;
Gtk::Image *Logo = manage(new class Gtk::Image());
- Logo->set(imagepath+"synfig_icon."IMAGE_EXT);
+ Logo->set(imagepath+"synfig_icon." IMAGE_EXT);
set_logo(Logo->get_pixbuf());
#ifdef SHOW_EXTRA_INFO

389
graphics/synfigstudio/files/patch-src_gui_iconcontroller.cpp Normal file
View file

@ -0,0 +1,389 @@
--- src/gui/iconcontroller.cpp.orig 2017-04-02 22:43:26 UTC
+++ src/gui/iconcontroller.cpp
@@ -134,213 +134,213 @@ IconController::init_icons(const synfig::String& path_
Gtk::Stock::add(stock_##name);
// Types
- INIT_STOCK_ICON(type_bool,"type_bool_icon."IMAGE_EXT,_("Bool"));
- INIT_STOCK_ICON(type_integer,"type_integer_icon."IMAGE_EXT,_("Integer"));
- INIT_STOCK_ICON(type_angle,"type_angle_icon."IMAGE_EXT,_("Angle"));
- INIT_STOCK_ICON(type_time,"type_time_icon."IMAGE_EXT,_("Time"));
- INIT_STOCK_ICON(type_real,"type_real_icon."IMAGE_EXT,_("Real"));
- INIT_STOCK_ICON(type_vector,"type_vector_icon."IMAGE_EXT,_("Vector"));
- INIT_STOCK_ICON(type_color,"type_color_icon."IMAGE_EXT,_("Color"));
- INIT_STOCK_ICON(type_segment,"type_segment_icon."IMAGE_EXT,_("Segment"));
- INIT_STOCK_ICON(type_blinepoint,"type_splinepoint_icon."IMAGE_EXT,_("Spline Point"));
- INIT_STOCK_ICON(type_list,"type_list_icon."IMAGE_EXT,_("List"));
- INIT_STOCK_ICON(type_string,"type_string_icon."IMAGE_EXT,_("String"));
- INIT_STOCK_ICON(type_canvas,"type_canvas_icon."IMAGE_EXT,_("Canvas"));
- INIT_STOCK_ICON(type_gradient,"type_gradient_icon."IMAGE_EXT,_("Gradient"))
+ INIT_STOCK_ICON(type_bool,"type_bool_icon." IMAGE_EXT,_("Bool"));
+ INIT_STOCK_ICON(type_integer,"type_integer_icon." IMAGE_EXT,_("Integer"));
+ INIT_STOCK_ICON(type_angle,"type_angle_icon." IMAGE_EXT,_("Angle"));
+ INIT_STOCK_ICON(type_time,"type_time_icon." IMAGE_EXT,_("Time"));
+ INIT_STOCK_ICON(type_real,"type_real_icon." IMAGE_EXT,_("Real"));
+ INIT_STOCK_ICON(type_vector,"type_vector_icon." IMAGE_EXT,_("Vector"));
+ INIT_STOCK_ICON(type_color,"type_color_icon." IMAGE_EXT,_("Color"));
+ INIT_STOCK_ICON(type_segment,"type_segment_icon." IMAGE_EXT,_("Segment"));
+ INIT_STOCK_ICON(type_blinepoint,"type_splinepoint_icon." IMAGE_EXT,_("Spline Point"));
+ INIT_STOCK_ICON(type_list,"type_list_icon." IMAGE_EXT,_("List"));
+ INIT_STOCK_ICON(type_string,"type_string_icon." IMAGE_EXT,_("String"));
+ INIT_STOCK_ICON(type_canvas,"type_canvas_icon." IMAGE_EXT,_("Canvas"));
+ INIT_STOCK_ICON(type_gradient,"type_gradient_icon." IMAGE_EXT,_("Gradient"))
// ToolBox Tools
- INIT_STOCK_ICON(normal,"tool_normal_icon."IMAGE_EXT,_("Transform Tool"));
- INIT_STOCK_ICON(polygon,"tool_polyline_icon."IMAGE_EXT,_("Polygon Tool"));
- INIT_STOCK_ICON(bline,"tool_spline_icon."IMAGE_EXT,_("Spline Tool"));
- INIT_STOCK_ICON(eyedrop,"tool_eyedrop_icon."IMAGE_EXT,_("Eyedrop Tool"));
- INIT_STOCK_ICON(fill,"tool_fill_icon."IMAGE_EXT,_("Fill Tool"));
- INIT_STOCK_ICON(draw,"tool_draw_icon."IMAGE_EXT,_("Draw Tool"));
- INIT_STOCK_ICON(lasso,"tool_cutout_icon."IMAGE_EXT,_("Cutout Tool"));
- INIT_STOCK_ICON(brush,"tool_brush_icon."IMAGE_EXT,_("Brush Tool"));
- INIT_STOCK_ICON(sketch,"tool_sketch_icon."IMAGE_EXT,_("Sketch Tool"));
- INIT_STOCK_ICON(circle,"tool_circle_icon."IMAGE_EXT,_("Circle Tool"));
- INIT_STOCK_ICON(rectangle,"tool_rectangle_icon."IMAGE_EXT,_("Rectangle Tool"));
- INIT_STOCK_ICON(smooth_move,"tool_smooth_move_icon."IMAGE_EXT,_("SmoothMove Tool"));
- INIT_STOCK_ICON(rotate,"tool_rotate_icon."IMAGE_EXT,"Rotate Tool");
- INIT_STOCK_ICON(width,"tool_width_icon."IMAGE_EXT,_("Width Tool"));
- INIT_STOCK_ICON(scale,"tool_scale_icon."IMAGE_EXT,"Scale Tool");
- INIT_STOCK_ICON(zoom,"tool_zoom_icon."IMAGE_EXT,_("Zoom Tool"));
- INIT_STOCK_ICON(mirror,"tool_mirror_icon."IMAGE_EXT,_("Mirror Tool"));
- INIT_STOCK_ICON(text,"tool_text_icon."IMAGE_EXT,"Text Tool");
- INIT_STOCK_ICON(gradient,"tool_gradient_icon."IMAGE_EXT,_("Gradient Tool"));
- INIT_STOCK_ICON(star,"tool_star_icon."IMAGE_EXT,_("Star Tool"));
+ INIT_STOCK_ICON(normal,"tool_normal_icon." IMAGE_EXT,_("Transform Tool"));
+ INIT_STOCK_ICON(polygon,"tool_polyline_icon." IMAGE_EXT,_("Polygon Tool"));
+ INIT_STOCK_ICON(bline,"tool_spline_icon." IMAGE_EXT,_("Spline Tool"));
+ INIT_STOCK_ICON(eyedrop,"tool_eyedrop_icon." IMAGE_EXT,_("Eyedrop Tool"));
+ INIT_STOCK_ICON(fill,"tool_fill_icon." IMAGE_EXT,_("Fill Tool"));
+ INIT_STOCK_ICON(draw,"tool_draw_icon." IMAGE_EXT,_("Draw Tool"));
+ INIT_STOCK_ICON(lasso,"tool_cutout_icon." IMAGE_EXT,_("Cutout Tool"));
+ INIT_STOCK_ICON(brush,"tool_brush_icon." IMAGE_EXT,_("Brush Tool"));
+ INIT_STOCK_ICON(sketch,"tool_sketch_icon." IMAGE_EXT,_("Sketch Tool"));
+ INIT_STOCK_ICON(circle,"tool_circle_icon." IMAGE_EXT,_("Circle Tool"));
+ INIT_STOCK_ICON(rectangle,"tool_rectangle_icon." IMAGE_EXT,_("Rectangle Tool"));
+ INIT_STOCK_ICON(smooth_move,"tool_smooth_move_icon." IMAGE_EXT,_("SmoothMove Tool"));
+ INIT_STOCK_ICON(rotate,"tool_rotate_icon." IMAGE_EXT,"Rotate Tool");
+ INIT_STOCK_ICON(width,"tool_width_icon." IMAGE_EXT,_("Width Tool"));
+ INIT_STOCK_ICON(scale,"tool_scale_icon." IMAGE_EXT,"Scale Tool");
+ INIT_STOCK_ICON(zoom,"tool_zoom_icon." IMAGE_EXT,_("Zoom Tool"));
+ INIT_STOCK_ICON(mirror,"tool_mirror_icon." IMAGE_EXT,_("Mirror Tool"));
+ INIT_STOCK_ICON(text,"tool_text_icon." IMAGE_EXT,"Text Tool");
+ INIT_STOCK_ICON(gradient,"tool_gradient_icon." IMAGE_EXT,_("Gradient Tool"));
+ INIT_STOCK_ICON(star,"tool_star_icon." IMAGE_EXT,_("Star Tool"));
// ToolBox Others
- INIT_STOCK_ICON(reset_colors,"reset_colors_icon."IMAGE_EXT,_("Reset Colors"));
- INIT_STOCK_ICON(swap_colors,"swap_colors_icon."IMAGE_EXT,_("Swap Colors"));
- INIT_STOCK_ICON(value_node,"valuenode_icon."IMAGE_EXT,_("ValueNode"));
- INIT_STOCK_ICON(valuenode_forbidanimation,"valuenode_forbidanimation_icon."IMAGE_EXT,_("ValueNode Forbid Animation"));
- INIT_STOCK_ICON(rename,"rename_icon."IMAGE_EXT,_("Rename"));
- INIT_STOCK_ICON(canvas,"canvas_icon."IMAGE_EXT,_("Canvas"));
- INIT_STOCK_ICON(canvas_new,"canvas_icon."IMAGE_EXT,_("New Canvas"));
+ INIT_STOCK_ICON(reset_colors,"reset_colors_icon." IMAGE_EXT,_("Reset Colors"));
+ INIT_STOCK_ICON(swap_colors,"swap_colors_icon." IMAGE_EXT,_("Swap Colors"));
+ INIT_STOCK_ICON(value_node,"valuenode_icon." IMAGE_EXT,_("ValueNode"));
+ INIT_STOCK_ICON(valuenode_forbidanimation,"valuenode_forbidanimation_icon." IMAGE_EXT,_("ValueNode Forbid Animation"));
+ INIT_STOCK_ICON(rename,"rename_icon." IMAGE_EXT,_("Rename"));
+ INIT_STOCK_ICON(canvas,"canvas_icon." IMAGE_EXT,_("Canvas"));
+ INIT_STOCK_ICON(canvas_new,"canvas_icon." IMAGE_EXT,_("New Canvas"));
// Document Related Actions
- INIT_STOCK_ICON(about,"about_icon."IMAGE_EXT,_("About"));
- INIT_STOCK_ICON(new_doc,"action_doc_new_icon."IMAGE_EXT,_("New"));
- INIT_STOCK_ICON(open,"action_doc_open_icon."IMAGE_EXT,_("Open"));
- INIT_STOCK_ICON(save,"action_doc_save_icon."IMAGE_EXT,_("Save"));
- INIT_STOCK_ICON(save_as,"action_doc_saveas_icon."IMAGE_EXT,_("Save As"));
- INIT_STOCK_ICON(save_all,"action_doc_saveall_icon."IMAGE_EXT,_("Save All"));
- INIT_STOCK_ICON(redo,"action_doc_redo_icon."IMAGE_EXT,_("Redo"));
- INIT_STOCK_ICON(undo,"action_doc_undo_icon."IMAGE_EXT,_("Undo"));
+ INIT_STOCK_ICON(about,"about_icon." IMAGE_EXT,_("About"));
+ INIT_STOCK_ICON(new_doc,"action_doc_new_icon." IMAGE_EXT,_("New"));
+ INIT_STOCK_ICON(open,"action_doc_open_icon." IMAGE_EXT,_("Open"));
+ INIT_STOCK_ICON(save,"action_doc_save_icon." IMAGE_EXT,_("Save"));
+ INIT_STOCK_ICON(save_as,"action_doc_saveas_icon." IMAGE_EXT,_("Save As"));
+ INIT_STOCK_ICON(save_all,"action_doc_saveall_icon." IMAGE_EXT,_("Save All"));
+ INIT_STOCK_ICON(redo,"action_doc_redo_icon." IMAGE_EXT,_("Redo"));
+ INIT_STOCK_ICON(undo,"action_doc_undo_icon." IMAGE_EXT,_("Undo"));
// Layers
- INIT_STOCK_ICON(layer,"layer_icon."IMAGE_EXT,_("Layer"));
+ INIT_STOCK_ICON(layer,"layer_icon." IMAGE_EXT,_("Layer"));
// Blur Layers
- INIT_STOCK_ICON(layer_blur_blur,"layer_blur_blur_icon."IMAGE_EXT,_("Blur Layer"));
- INIT_STOCK_ICON(layer_blur_motion,"layer_blur_motion_icon."IMAGE_EXT,_("Motion Blur Layer"));
- INIT_STOCK_ICON(layer_blur_radial,"layer_blur_radial_icon."IMAGE_EXT,_("Radial Blur Layer"));
+ INIT_STOCK_ICON(layer_blur_blur,"layer_blur_blur_icon." IMAGE_EXT,_("Blur Layer"));
+ INIT_STOCK_ICON(layer_blur_motion,"layer_blur_motion_icon." IMAGE_EXT,_("Motion Blur Layer"));
+ INIT_STOCK_ICON(layer_blur_radial,"layer_blur_radial_icon." IMAGE_EXT,_("Radial Blur Layer"));
// Distortion Layers
- INIT_STOCK_ICON(layer_distortion_curvewarp,"layer_distortion_curvewarp_icon."IMAGE_EXT,_("Curve Warp Layer"));
- INIT_STOCK_ICON(layer_distortion_insideout,"layer_distortion_insideout_icon."IMAGE_EXT,_("Inside Out Layer"));
- INIT_STOCK_ICON(layer_distortion_noise,"layer_distortion_noise_icon."IMAGE_EXT,_("Noise Distort Layer"));
- INIT_STOCK_ICON(layer_distortion_spherize,"layer_distortion_spherize_icon."IMAGE_EXT,_("Spherize Layer"));
- INIT_STOCK_ICON(layer_distortion_stretch,"layer_distortion_stretch_icon."IMAGE_EXT,_("Stretch Layer"));
- INIT_STOCK_ICON(layer_distortion_twirl,"layer_distortion_twirl_icon."IMAGE_EXT,_("Twirl Layer"));
- INIT_STOCK_ICON(layer_distortion_warp,"layer_distortion_warp_icon."IMAGE_EXT,_("Warp Layer"));
+ INIT_STOCK_ICON(layer_distortion_curvewarp,"layer_distortion_curvewarp_icon." IMAGE_EXT,_("Curve Warp Layer"));
+ INIT_STOCK_ICON(layer_distortion_insideout,"layer_distortion_insideout_icon." IMAGE_EXT,_("Inside Out Layer"));
+ INIT_STOCK_ICON(layer_distortion_noise,"layer_distortion_noise_icon." IMAGE_EXT,_("Noise Distort Layer"));
+ INIT_STOCK_ICON(layer_distortion_spherize,"layer_distortion_spherize_icon." IMAGE_EXT,_("Spherize Layer"));
+ INIT_STOCK_ICON(layer_distortion_stretch,"layer_distortion_stretch_icon." IMAGE_EXT,_("Stretch Layer"));
+ INIT_STOCK_ICON(layer_distortion_twirl,"layer_distortion_twirl_icon." IMAGE_EXT,_("Twirl Layer"));
+ INIT_STOCK_ICON(layer_distortion_warp,"layer_distortion_warp_icon." IMAGE_EXT,_("Warp Layer"));
// Example Layers
- INIT_STOCK_ICON(layer_example_filledrectangle,"layer_example_filledrectangle_icon."IMAGE_EXT,_("Filled Rectangle Layer"));
- INIT_STOCK_ICON(layer_example_metaballs,"layer_example_metaballs_icon."IMAGE_EXT,_("Metallballs Layer"));
- INIT_STOCK_ICON(layer_example_simplecircle,"layer_example_simplecircle_icon."IMAGE_EXT,_("Simple Circle Layer"));
+ INIT_STOCK_ICON(layer_example_filledrectangle,"layer_example_filledrectangle_icon." IMAGE_EXT,_("Filled Rectangle Layer"));
+ INIT_STOCK_ICON(layer_example_metaballs,"layer_example_metaballs_icon." IMAGE_EXT,_("Metallballs Layer"));
+ INIT_STOCK_ICON(layer_example_simplecircle,"layer_example_simplecircle_icon." IMAGE_EXT,_("Simple Circle Layer"));
// Filter Layers
- INIT_STOCK_ICON(layer_filter_clamp,"layer_filter_clamp_icon."IMAGE_EXT,_("Clamp Layer"));
- INIT_STOCK_ICON(layer_filter_colorcorrect,"layer_filter_colorcorrect_icon."IMAGE_EXT,_("Color Correct Layer"));
- INIT_STOCK_ICON(layer_filter_halftone2,"layer_filter_halftone2_icon."IMAGE_EXT,_("Halftone 2 Layer"));
- INIT_STOCK_ICON(layer_filter_halftone3,"layer_filter_halftone3_icon."IMAGE_EXT,_("Halftone 3 Layer"));
- INIT_STOCK_ICON(layer_filter_lumakey,"layer_filter_lumakey_icon."IMAGE_EXT,_("Luma Key Layer"));
+ INIT_STOCK_ICON(layer_filter_clamp,"layer_filter_clamp_icon." IMAGE_EXT,_("Clamp Layer"));
+ INIT_STOCK_ICON(layer_filter_colorcorrect,"layer_filter_colorcorrect_icon." IMAGE_EXT,_("Color Correct Layer"));
+ INIT_STOCK_ICON(layer_filter_halftone2,"layer_filter_halftone2_icon." IMAGE_EXT,_("Halftone 2 Layer"));
+ INIT_STOCK_ICON(layer_filter_halftone3,"layer_filter_halftone3_icon." IMAGE_EXT,_("Halftone 3 Layer"));
+ INIT_STOCK_ICON(layer_filter_lumakey,"layer_filter_lumakey_icon." IMAGE_EXT,_("Luma Key Layer"));
// Fractal Layers
- INIT_STOCK_ICON(layer_fractal_julia,"layer_fractal_julia_icon."IMAGE_EXT,_("Julia Set Layer"));
- INIT_STOCK_ICON(layer_fractal_mandelbrot,"layer_fractal_mandelbrot_icon."IMAGE_EXT,_("Mandelbrot Set Layer"));
+ INIT_STOCK_ICON(layer_fractal_julia,"layer_fractal_julia_icon." IMAGE_EXT,_("Julia Set Layer"));
+ INIT_STOCK_ICON(layer_fractal_mandelbrot,"layer_fractal_mandelbrot_icon." IMAGE_EXT,_("Mandelbrot Set Layer"));
// Geometry Layers
- INIT_STOCK_ICON(layer_geometry_checkerboard,"layer_geometry_checkerboard_icon."IMAGE_EXT,_("Checker Board Layer"));
- INIT_STOCK_ICON(layer_geometry_circle,"layer_geometry_circle_icon."IMAGE_EXT,_("Circle Layer"));
- INIT_STOCK_ICON(layer_geometry_outline,"layer_geometry_outline_icon."IMAGE_EXT,_("Outline Layer"));
- INIT_STOCK_ICON(layer_geometry_advanced_outline,"layer_geometry_advanced_outline_icon."IMAGE_EXT,_("Advanced Outline Layer"));
- INIT_STOCK_ICON(layer_geometry_polygon,"layer_geometry_polygon_icon."IMAGE_EXT,_("Polygon Layer"));
- INIT_STOCK_ICON(layer_geometry_rectangle,"layer_geometry_rectangle_icon."IMAGE_EXT,_("Rectangle Layer"));
- INIT_STOCK_ICON(layer_geometry_region,"layer_geometry_region_icon."IMAGE_EXT,_("Region Layer"));
- INIT_STOCK_ICON(layer_geometry_solidcolor,"layer_geometry_solidcolor_icon."IMAGE_EXT,_("Solid Color Layer"));
- INIT_STOCK_ICON(layer_geometry_star,"layer_geometry_star_icon."IMAGE_EXT,_("Star Layer"));
+ INIT_STOCK_ICON(layer_geometry_checkerboard,"layer_geometry_checkerboard_icon." IMAGE_EXT,_("Checker Board Layer"));
+ INIT_STOCK_ICON(layer_geometry_circle,"layer_geometry_circle_icon." IMAGE_EXT,_("Circle Layer"));
+ INIT_STOCK_ICON(layer_geometry_outline,"layer_geometry_outline_icon." IMAGE_EXT,_("Outline Layer"));
+ INIT_STOCK_ICON(layer_geometry_advanced_outline,"layer_geometry_advanced_outline_icon." IMAGE_EXT,_("Advanced Outline Layer"));
+ INIT_STOCK_ICON(layer_geometry_polygon,"layer_geometry_polygon_icon." IMAGE_EXT,_("Polygon Layer"));
+ INIT_STOCK_ICON(layer_geometry_rectangle,"layer_geometry_rectangle_icon." IMAGE_EXT,_("Rectangle Layer"));
+ INIT_STOCK_ICON(layer_geometry_region,"layer_geometry_region_icon." IMAGE_EXT,_("Region Layer"));
+ INIT_STOCK_ICON(layer_geometry_solidcolor,"layer_geometry_solidcolor_icon." IMAGE_EXT,_("Solid Color Layer"));
+ INIT_STOCK_ICON(layer_geometry_star,"layer_geometry_star_icon." IMAGE_EXT,_("Star Layer"));
// Gradient Layers
- INIT_STOCK_ICON(layer_gradient_conical,"layer_gradient_conical_icon."IMAGE_EXT,_("Conical Gradient Layer"));
- INIT_STOCK_ICON(layer_gradient_curve,"layer_gradient_curve_icon."IMAGE_EXT,_("Curve Gradient Layer"));
- INIT_STOCK_ICON(layer_gradient_noise,"layer_gradient_noise_icon."IMAGE_EXT,_("Noise Gradient Layer"));
- INIT_STOCK_ICON(layer_gradient_linear,"layer_gradient_linear_icon."IMAGE_EXT,_("Linear Gradient Layer"));
- INIT_STOCK_ICON(layer_gradient_radial,"layer_gradient_radial_icon."IMAGE_EXT,_("Radial Gradient Layer"));
- INIT_STOCK_ICON(layer_gradient_spiral,"layer_gradient_spiral_icon."IMAGE_EXT,_("Spiral Gradient Layer"));
+ INIT_STOCK_ICON(layer_gradient_conical,"layer_gradient_conical_icon." IMAGE_EXT,_("Conical Gradient Layer"));
+ INIT_STOCK_ICON(layer_gradient_curve,"layer_gradient_curve_icon." IMAGE_EXT,_("Curve Gradient Layer"));
+ INIT_STOCK_ICON(layer_gradient_noise,"layer_gradient_noise_icon." IMAGE_EXT,_("Noise Gradient Layer"));
+ INIT_STOCK_ICON(layer_gradient_linear,"layer_gradient_linear_icon." IMAGE_EXT,_("Linear Gradient Layer"));
+ INIT_STOCK_ICON(layer_gradient_radial,"layer_gradient_radial_icon." IMAGE_EXT,_("Radial Gradient Layer"));
+ INIT_STOCK_ICON(layer_gradient_spiral,"layer_gradient_spiral_icon." IMAGE_EXT,_("Spiral Gradient Layer"));
// Other Layers
- INIT_STOCK_ICON(layer_other_duplicate,"layer_other_duplicate_icon."IMAGE_EXT,_("Duplicate Layer"));
- INIT_STOCK_ICON(layer_other_importimage,"layer_other_importimage_icon."IMAGE_EXT,_("Import Image Layer"));
- INIT_STOCK_ICON(layer_other_pastecanvas,"layer_other_group_icon."IMAGE_EXT,_("Group Layer"));
- INIT_STOCK_ICON(layer_other_plant,"layer_other_plant_icon."IMAGE_EXT,_("Plant Layer"));
- INIT_STOCK_ICON(layer_other_stroboscope,"layer_other_stroboscope_icon."IMAGE_EXT,_("Stroboscope Layer"));
- INIT_STOCK_ICON(layer_other_supersample,"layer_other_supersample_icon."IMAGE_EXT,_("Super Sample Layer"));
- INIT_STOCK_ICON(layer_other_sound,"layer_other_sound_icon."IMAGE_EXT,_("Sound Layer"));
- INIT_STOCK_ICON(layer_other_switch,"layer_other_switch_icon."IMAGE_EXT,_("Switch Layer"));
- INIT_STOCK_ICON(layer_other_skeleton,"layer_other_skeleton_icon."IMAGE_EXT,_("Skeleton Layer"));
- INIT_STOCK_ICON(layer_other_text,"layer_other_text_icon."IMAGE_EXT,_("Text Layer"));
- INIT_STOCK_ICON(layer_other_timeloop,"layer_other_timeloop_icon."IMAGE_EXT,_("Time Loop Layer"));
- INIT_STOCK_ICON(layer_other_xorpattern,"layer_other_xorpattern_icon."IMAGE_EXT,_("XOR Pattern Layer"));
+ INIT_STOCK_ICON(layer_other_duplicate,"layer_other_duplicate_icon." IMAGE_EXT,_("Duplicate Layer"));
+ INIT_STOCK_ICON(layer_other_importimage,"layer_other_importimage_icon." IMAGE_EXT,_("Import Image Layer"));
+ INIT_STOCK_ICON(layer_other_pastecanvas,"layer_other_group_icon." IMAGE_EXT,_("Group Layer"));
+ INIT_STOCK_ICON(layer_other_plant,"layer_other_plant_icon." IMAGE_EXT,_("Plant Layer"));
+ INIT_STOCK_ICON(layer_other_stroboscope,"layer_other_stroboscope_icon." IMAGE_EXT,_("Stroboscope Layer"));
+ INIT_STOCK_ICON(layer_other_supersample,"layer_other_supersample_icon." IMAGE_EXT,_("Super Sample Layer"));
+ INIT_STOCK_ICON(layer_other_sound,"layer_other_sound_icon." IMAGE_EXT,_("Sound Layer"));
+ INIT_STOCK_ICON(layer_other_switch,"layer_other_switch_icon." IMAGE_EXT,_("Switch Layer"));
+ INIT_STOCK_ICON(layer_other_skeleton,"layer_other_skeleton_icon." IMAGE_EXT,_("Skeleton Layer"));
+ INIT_STOCK_ICON(layer_other_text,"layer_other_text_icon." IMAGE_EXT,_("Text Layer"));
+ INIT_STOCK_ICON(layer_other_timeloop,"layer_other_timeloop_icon." IMAGE_EXT,_("Time Loop Layer"));
+ INIT_STOCK_ICON(layer_other_xorpattern,"layer_other_xorpattern_icon." IMAGE_EXT,_("XOR Pattern Layer"));
// Stylize Layers
- INIT_STOCK_ICON(layer_stylize_bevel,"layer_stylize_bevel_icon."IMAGE_EXT,_("Bevel Layer"));
- INIT_STOCK_ICON(layer_stylize_shade,"layer_stylize_shade_icon."IMAGE_EXT,_("Shade Layer"));
+ INIT_STOCK_ICON(layer_stylize_bevel,"layer_stylize_bevel_icon." IMAGE_EXT,_("Bevel Layer"));
+ INIT_STOCK_ICON(layer_stylize_shade,"layer_stylize_shade_icon." IMAGE_EXT,_("Shade Layer"));
// Transform Layers
- INIT_STOCK_ICON(layer_transform_rotate,"layer_transform_rotate_icon."IMAGE_EXT,_("Rotate Layer"));
- INIT_STOCK_ICON(layer_transform_translate,"layer_transform_translate_icon."IMAGE_EXT,_("Translate Layer"));
- INIT_STOCK_ICON(layer_transform_scale,"layer_transform_scale_icon."IMAGE_EXT,_("Scale Layer"));
+ INIT_STOCK_ICON(layer_transform_rotate,"layer_transform_rotate_icon." IMAGE_EXT,_("Rotate Layer"));
+ INIT_STOCK_ICON(layer_transform_translate,"layer_transform_translate_icon." IMAGE_EXT,_("Translate Layer"));
+ INIT_STOCK_ICON(layer_transform_scale,"layer_transform_scale_icon." IMAGE_EXT,_("Scale Layer"));
- INIT_STOCK_ICON(info,"info_icon."IMAGE_EXT,_("Info Tool"));
- INIT_STOCK_ICON(group,"set_icon."IMAGE_EXT,_("Set"));
+ INIT_STOCK_ICON(info,"info_icon." IMAGE_EXT,_("Info Tool"));
+ INIT_STOCK_ICON(group,"set_icon." IMAGE_EXT,_("Set"));
- INIT_STOCK_ICON(grid_enable,"grid_enable_icon."IMAGE_EXT,_("Show Grid"));
- INIT_STOCK_ICON(grid_disable,"grid_disable_icon."IMAGE_EXT,_("Hide Grid"));
- INIT_STOCK_ICON(grid_snap_enable,"grid_snap_enable_icon."IMAGE_EXT,_("Enable Grid Snap"));
- INIT_STOCK_ICON(grid_snap_disable,"grid_snap_disable_icon."IMAGE_EXT,_("Disable Grid Snap"));
- INIT_STOCK_ICON(duplicate,"duplicate_icon."IMAGE_EXT,_("Duplicate"));
- INIT_STOCK_ICON(encapsulate,"group_icon."IMAGE_EXT,_("Group"));
- INIT_STOCK_ICON(select_all_child_layers,"select_all_child_layers_icon."IMAGE_EXT,_("Select All Child Layers"));
+ INIT_STOCK_ICON(grid_enable,"grid_enable_icon." IMAGE_EXT,_("Show Grid"));
+ INIT_STOCK_ICON(grid_disable,"grid_disable_icon." IMAGE_EXT,_("Hide Grid"));
+ INIT_STOCK_ICON(grid_snap_enable,"grid_snap_enable_icon." IMAGE_EXT,_("Enable Grid Snap"));
+ INIT_STOCK_ICON(grid_snap_disable,"grid_snap_disable_icon." IMAGE_EXT,_("Disable Grid Snap"));
+ INIT_STOCK_ICON(duplicate,"duplicate_icon." IMAGE_EXT,_("Duplicate"));
+ INIT_STOCK_ICON(encapsulate,"group_icon." IMAGE_EXT,_("Group"));
+ INIT_STOCK_ICON(select_all_child_layers,"select_all_child_layers_icon." IMAGE_EXT,_("Select All Child Layers"));
- INIT_STOCK_ICON(clear_undo,"clear_undo_icon."IMAGE_EXT,_("Clear Undo Stack"));
- INIT_STOCK_ICON(clear_redo,"clear_redo_icon."IMAGE_EXT,_("Clear Redo Stack"));
+ INIT_STOCK_ICON(clear_undo,"clear_undo_icon." IMAGE_EXT,_("Clear Undo Stack"));
+ INIT_STOCK_ICON(clear_redo,"clear_redo_icon." IMAGE_EXT,_("Clear Redo Stack"));
- INIT_STOCK_ICON(children,"library_icon."IMAGE_EXT,_("Library"));
- INIT_STOCK_ICON(curves,"graphs_icon."IMAGE_EXT,_("Graphs"));
- INIT_STOCK_ICON(keyframes,"keyframe_icon."IMAGE_EXT,_("Keyframes"));
- INIT_STOCK_ICON(meta_data,"meta_data_icon."IMAGE_EXT,_("MetaData"));
- INIT_STOCK_ICON(navigator,"navigator_icon."IMAGE_EXT,_("Navigator"));
- INIT_STOCK_ICON(timetrack,"time_track_icon."IMAGE_EXT,_("Time Track"));
- INIT_STOCK_ICON(history,"history_icon."IMAGE_EXT,_("History"));
- INIT_STOCK_ICON(palette,"palette_icon."IMAGE_EXT,_("Palette"));
- INIT_STOCK_ICON(params,"parameters_icon."IMAGE_EXT,_("Parameters"));
+ INIT_STOCK_ICON(children,"library_icon." IMAGE_EXT,_("Library"));
+ INIT_STOCK_ICON(curves,"graphs_icon." IMAGE_EXT,_("Graphs"));
+ INIT_STOCK_ICON(keyframes,"keyframe_icon." IMAGE_EXT,_("Keyframes"));
+ INIT_STOCK_ICON(meta_data,"meta_data_icon." IMAGE_EXT,_("MetaData"));
+ INIT_STOCK_ICON(navigator,"navigator_icon." IMAGE_EXT,_("Navigator"));
+ INIT_STOCK_ICON(timetrack,"time_track_icon." IMAGE_EXT,_("Time Track"));
+ INIT_STOCK_ICON(history,"history_icon." IMAGE_EXT,_("History"));
+ INIT_STOCK_ICON(palette,"palette_icon." IMAGE_EXT,_("Palette"));
+ INIT_STOCK_ICON(params,"parameters_icon." IMAGE_EXT,_("Parameters"));
- INIT_STOCK_ICON(keyframe_lock_past_off,"keyframe_lock_past_off_icon."IMAGE_EXT,_("Past keyframes unlocked"));
- INIT_STOCK_ICON(keyframe_lock_past_on,"keyframe_lock_past_on_icon."IMAGE_EXT,_("Past keyframes locked"));
- INIT_STOCK_ICON(keyframe_lock_future_off,"keyframe_lock_future_off_icon."IMAGE_EXT,_("Future keyframes unlocked"));
- INIT_STOCK_ICON(keyframe_lock_future_on,"keyframe_lock_future_on_icon."IMAGE_EXT,_("Future keyframes locked"));
+ INIT_STOCK_ICON(keyframe_lock_past_off,"keyframe_lock_past_off_icon." IMAGE_EXT,_("Past keyframes unlocked"));
+ INIT_STOCK_ICON(keyframe_lock_past_on,"keyframe_lock_past_on_icon." IMAGE_EXT,_("Past keyframes locked"));
+ INIT_STOCK_ICON(keyframe_lock_future_off,"keyframe_lock_future_off_icon." IMAGE_EXT,_("Future keyframes unlocked"));
+ INIT_STOCK_ICON(keyframe_lock_future_on,"keyframe_lock_future_on_icon." IMAGE_EXT,_("Future keyframes locked"));
- INIT_STOCK_ICON(animate_mode_off,"animate_mode_off_icon."IMAGE_EXT,_("Animate Mode Off"));
- INIT_STOCK_ICON(animate_mode_on,"animate_mode_on_icon."IMAGE_EXT,_("Animate Mode On"));
+ INIT_STOCK_ICON(animate_mode_off,"animate_mode_off_icon." IMAGE_EXT,_("Animate Mode Off"));
+ INIT_STOCK_ICON(animate_mode_on,"animate_mode_on_icon." IMAGE_EXT,_("Animate Mode On"));
- INIT_STOCK_ICON(jack, "jack_icon."IMAGE_EXT, _("JACK"));
+ INIT_STOCK_ICON(jack, "jack_icon." IMAGE_EXT, _("JACK"));
- INIT_STOCK_ICON(set_outline_color,"set_outline_color."IMAGE_EXT,_("Set as Outline"));
- INIT_STOCK_ICON(set_fill_color,"set_fill_color."IMAGE_EXT,_("Set as Fill"));
+ INIT_STOCK_ICON(set_outline_color,"set_outline_color." IMAGE_EXT,_("Set as Outline"));
+ INIT_STOCK_ICON(set_fill_color,"set_fill_color." IMAGE_EXT,_("Set as Fill"));
- INIT_STOCK_ICON(animate_seek_begin,"animate_seek_begin_icon."IMAGE_EXT,_("Seek to Begin"));
- INIT_STOCK_ICON(animate_seek_prev_keyframe,"animate_seek_prev_keyframe_icon."IMAGE_EXT,_("Seek to Previous Keyframe"));
- INIT_STOCK_ICON(animate_seek_prev_frame,"animate_seek_prev_frame_icon."IMAGE_EXT,_("Seek to Previous Frame"));
- INIT_STOCK_ICON(animate_play,"animate_play_icon."IMAGE_EXT,_("Play"));
- INIT_STOCK_ICON(animate_stop,"animate_stop_icon."IMAGE_EXT,_("Stop"));
- INIT_STOCK_ICON(animate_pause,"animate_pause_icon."IMAGE_EXT,_("Pause"));
- INIT_STOCK_ICON(animate_seek_next_frame,"animate_seek_next_frame_icon."IMAGE_EXT,_("Seek to Next frame"));
- INIT_STOCK_ICON(animate_seek_next_keyframe,"animate_seek_next_keyframe_icon."IMAGE_EXT,_("Seek to Next Keyframe"));
- INIT_STOCK_ICON(animate_seek_end,"animate_seek_end_icon."IMAGE_EXT,_("Seek to End"));
- INIT_STOCK_ICON(animate_loop,"animate_loop_icon."IMAGE_EXT,_("Animate Loop"));
+ INIT_STOCK_ICON(animate_seek_begin,"animate_seek_begin_icon." IMAGE_EXT,_("Seek to Begin"));
+ INIT_STOCK_ICON(animate_seek_prev_keyframe,"animate_seek_prev_keyframe_icon." IMAGE_EXT,_("Seek to Previous Keyframe"));
+ INIT_STOCK_ICON(animate_seek_prev_frame,"animate_seek_prev_frame_icon." IMAGE_EXT,_("Seek to Previous Frame"));
+ INIT_STOCK_ICON(animate_play,"animate_play_icon." IMAGE_EXT,_("Play"));
+ INIT_STOCK_ICON(animate_stop,"animate_stop_icon." IMAGE_EXT,_("Stop"));
+ INIT_STOCK_ICON(animate_pause,"animate_pause_icon." IMAGE_EXT,_("Pause"));
+ INIT_STOCK_ICON(animate_seek_next_frame,"animate_seek_next_frame_icon." IMAGE_EXT,_("Seek to Next frame"));
+ INIT_STOCK_ICON(animate_seek_next_keyframe,"animate_seek_next_keyframe_icon." IMAGE_EXT,_("Seek to Next Keyframe"));
+ INIT_STOCK_ICON(animate_seek_end,"animate_seek_end_icon." IMAGE_EXT,_("Seek to End"));
+ INIT_STOCK_ICON(animate_loop,"animate_loop_icon." IMAGE_EXT,_("Animate Loop"));
- INIT_STOCK_ICON(add_to_group,"action_add_to_set_icon."IMAGE_EXT,_("Add Layer to Set"));
- INIT_STOCK_ICON(remove_from_group,"action_remove_from_set_icon."IMAGE_EXT,_("Remove Layer from Set"));
- INIT_STOCK_ICON(set_desc,"action_set_layer_description_icon."IMAGE_EXT,_("Set Layer Description"));
- INIT_STOCK_ICON(export,"action_export_icon."IMAGE_EXT,_("Export Value Node"));
- INIT_STOCK_ICON(unexport,"action_unexport_icon."IMAGE_EXT,_("Unexport Value Node"));
- INIT_STOCK_ICON(flat_interpolation,"action_flat_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Flat"));
- INIT_STOCK_ICON(interpolate_interpolation,"action_interpolate_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Interpolate"));
- INIT_STOCK_ICON(peak_interpolation,"action_peak_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Peak"));
- INIT_STOCK_ICON(rounded_interpolation,"action_rounded_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Rounded"));
- INIT_STOCK_ICON(squared_interpolation,"action_squared_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Squared"));
+ INIT_STOCK_ICON(add_to_group,"action_add_to_set_icon." IMAGE_EXT,_("Add Layer to Set"));
+ INIT_STOCK_ICON(remove_from_group,"action_remove_from_set_icon." IMAGE_EXT,_("Remove Layer from Set"));
+ INIT_STOCK_ICON(set_desc,"action_set_layer_description_icon." IMAGE_EXT,_("Set Layer Description"));
+ INIT_STOCK_ICON(export,"action_export_icon." IMAGE_EXT,_("Export Value Node"));
+ INIT_STOCK_ICON(unexport,"action_unexport_icon." IMAGE_EXT,_("Unexport Value Node"));
+ INIT_STOCK_ICON(flat_interpolation,"action_flat_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Flat"));
+ INIT_STOCK_ICON(interpolate_interpolation,"action_interpolate_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Interpolate"));
+ INIT_STOCK_ICON(peak_interpolation,"action_peak_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Peak"));
+ INIT_STOCK_ICON(rounded_interpolation,"action_rounded_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Rounded"));
+ INIT_STOCK_ICON(squared_interpolation,"action_squared_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Squared"));
- INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon."IMAGE_EXT,_("Toggle position handles"));
- INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon."IMAGE_EXT,_("Toggle vertex handles"));
- INIT_STOCK_ICON(toggle_duck_tangent,"duck_tangent_icon."IMAGE_EXT,_("Toggle tangent handles"));
- INIT_STOCK_ICON(toggle_duck_radius,"duck_radius_icon."IMAGE_EXT,_("Toggle radius handles"));
- INIT_STOCK_ICON(toggle_duck_width,"duck_width_icon."IMAGE_EXT,_("Toggle width handles"));
- INIT_STOCK_ICON(toggle_duck_angle,"duck_angle_icon."IMAGE_EXT,_("Toggle angle handles"));
+ INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon." IMAGE_EXT,_("Toggle position handles"));
+ INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon." IMAGE_EXT,_("Toggle vertex handles"));
+ INIT_STOCK_ICON(toggle_duck_tangent,"duck_tangent_icon." IMAGE_EXT,_("Toggle tangent handles"));
+ INIT_STOCK_ICON(toggle_duck_radius,"duck_radius_icon." IMAGE_EXT,_("Toggle radius handles"));
+ INIT_STOCK_ICON(toggle_duck_width,"duck_width_icon." IMAGE_EXT,_("Toggle width handles"));
+ INIT_STOCK_ICON(toggle_duck_angle,"duck_angle_icon." IMAGE_EXT,_("Toggle angle handles"));
- INIT_STOCK_ICON(toggle_show_grid,"show_grid_icon."IMAGE_EXT,_("Toggle show grid"));
- INIT_STOCK_ICON(toggle_snap_grid,"snap_grid_icon."IMAGE_EXT,_("Toggle snap grid"));
- INIT_STOCK_ICON(toggle_show_guide,"show_guide_icon."IMAGE_EXT,_("Toggle show guide"));
- INIT_STOCK_ICON(toggle_snap_guide,"snap_guide_icon."IMAGE_EXT,_("Toggle snap guide"));
+ INIT_STOCK_ICON(toggle_show_grid,"show_grid_icon." IMAGE_EXT,_("Toggle show grid"));
+ INIT_STOCK_ICON(toggle_snap_grid,"snap_grid_icon." IMAGE_EXT,_("Toggle snap grid"));
+ INIT_STOCK_ICON(toggle_show_guide,"show_guide_icon." IMAGE_EXT,_("Toggle show guide"));
+ INIT_STOCK_ICON(toggle_snap_guide,"snap_guide_icon." IMAGE_EXT,_("Toggle snap guide"));
- INIT_STOCK_ICON(toggle_onion_skin,"onion_skin_icon."IMAGE_EXT,_("Toggle onion skin"));
+ INIT_STOCK_ICON(toggle_onion_skin,"onion_skin_icon." IMAGE_EXT,_("Toggle onion skin"));
- INIT_STOCK_ICON(increase_resolution,"incr_resolution_icon."IMAGE_EXT,_("Increase resolution"));
- INIT_STOCK_ICON(decrease_resolution,"decr_resolution_icon."IMAGE_EXT,_("Decrease resolution"));
+ INIT_STOCK_ICON(increase_resolution,"incr_resolution_icon." IMAGE_EXT,_("Increase resolution"));
+ INIT_STOCK_ICON(decrease_resolution,"decr_resolution_icon." IMAGE_EXT,_("Decrease resolution"));
- INIT_STOCK_ICON(preview_options,"preview_options_icon."IMAGE_EXT,_("Preview Options Dialog"));
- INIT_STOCK_ICON(render_options,"render_options_icon."IMAGE_EXT,_("Render Options Dialog"));
+ INIT_STOCK_ICON(preview_options,"preview_options_icon." IMAGE_EXT,_("Preview Options Dialog"));
+ INIT_STOCK_ICON(render_options,"render_options_icon." IMAGE_EXT,_("Render Options Dialog"));
- INIT_STOCK_ICON(interpolation_type_tcb,"interpolation_type_tcb_icon."IMAGE_EXT,_("TCB interpolation"));
- INIT_STOCK_ICON(interpolation_type_ease,"interpolation_type_ease_icon."IMAGE_EXT,_("Ease In/Out interpolation"));
- INIT_STOCK_ICON(interpolation_type_const,"interpolation_type_const_icon."IMAGE_EXT,_("Const interpolation"));
- INIT_STOCK_ICON(interpolation_type_linear,"interpolation_type_linear_icon."IMAGE_EXT,_("Linear interpolation"));
- INIT_STOCK_ICON(interpolation_type_clamped,"interpolation_type_clamped_icon."IMAGE_EXT,_("Clamped interpolation"));
+ INIT_STOCK_ICON(interpolation_type_tcb,"interpolation_type_tcb_icon." IMAGE_EXT,_("TCB interpolation"));
+ INIT_STOCK_ICON(interpolation_type_ease,"interpolation_type_ease_icon." IMAGE_EXT,_("Ease In/Out interpolation"));
+ INIT_STOCK_ICON(interpolation_type_const,"interpolation_type_const_icon." IMAGE_EXT,_("Const interpolation"));
+ INIT_STOCK_ICON(interpolation_type_linear,"interpolation_type_linear_icon." IMAGE_EXT,_("Linear interpolation"));
+ INIT_STOCK_ICON(interpolation_type_clamped,"interpolation_type_clamped_icon." IMAGE_EXT,_("Clamped interpolation"));
- INIT_STOCK_ICON(utils_chain_link_on,"utils_chain_link_on_icon."IMAGE_EXT,_("Linked"));
- INIT_STOCK_ICON(utils_chain_link_off,"utils_chain_link_off_icon."IMAGE_EXT,_("Unlinked"));
- INIT_STOCK_ICON(utils_timetrack_align,"utils_timetrack_align_icon."IMAGE_EXT,"Utils Timetrack align");
+ INIT_STOCK_ICON(utils_chain_link_on,"utils_chain_link_on_icon." IMAGE_EXT,_("Linked"));
+ INIT_STOCK_ICON(utils_chain_link_off,"utils_chain_link_off_icon." IMAGE_EXT,_("Unlinked"));
+ INIT_STOCK_ICON(utils_timetrack_align,"utils_timetrack_align_icon." IMAGE_EXT,"Utils Timetrack align");
INIT_STOCK_ICON_CLONE(cvs_add,"gtk-add",_("CVS Add"));
INIT_STOCK_ICON_CLONE(cvs_update,"gtk-open",_("CVS Update"));

23
graphics/synfigstudio/files/patch-src_gui_splash.cpp Normal file
View file

@ -0,0 +1,23 @@
--- src/gui/splash.cpp.orig 2017-04-02 22:54:21 UTC
+++ src/gui/splash.cpp
@@ -185,9 +185,9 @@ Splash::Splash():
if(ran >0.499999)
number = 2;
//synfig::info("%s", strprintf("%d",number).c_str());
- splash_image->set(imagepath+"splash_screen"+strprintf("%d",number)+"."IMAGE_EXT);
+ splash_image->set(imagepath+"splash_screen"+strprintf("%d",number)+"." IMAGE_EXT);
*/
- splash_image->set(imagepath+"splash_screen."IMAGE_EXT);
+ splash_image->set(imagepath+"splash_screen." IMAGE_EXT);
splash_image->set_alignment(0.5,0.5);
splash_image->set_padding(0,0);
@@ -220,7 +220,7 @@ Splash::Splash():
frame->add(*fixed);
// Set up the parameters for this pop-up window
- set_title("Synfig Studio "VERSION);
+ set_title("Synfig Studio " VERSION);
set_modal(false);
property_window_position().set_value(Gtk::WIN_POS_CENTER);
set_resizable(false);

3
irc/bitlbee/Makefile
View file

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= bitlbee
PORTVERSION= 3.5
PORTREVISION= 2
PORTVERSION= 3.5.1
CATEGORIES= irc
MASTER_SITES= http://get.bitlbee.org/src/ \
LOCAL/brix

6
irc/bitlbee/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1483980206
SHA256 (bitlbee-3.5.tar.gz) = 549d02181ab303dfe8a219faafd7a1aea7ee642eb071b767f668782a57388319
SIZE (bitlbee-3.5.tar.gz) = 657177
TIMESTAMP = 1487513940
SHA256 (bitlbee-3.5.1.tar.gz) = 9636d7fd89ebb3756c13a9a3387736ca6d56ccf66ec0580d512f07b21db0fa69
SIZE (bitlbee-3.5.1.tar.gz) = 680351

2
multimedia/Makefile
View file

@ -210,8 +210,10 @@
SUBDIR += libv4l
SUBDIR += libva
SUBDIR += libva-intel-driver
SUBDIR += libva-utils
SUBDIR += libva-vdpau-driver
SUBDIR += libvdpau
SUBDIR += libvdpau-va-gl
SUBDIR += libvpx
SUBDIR += libx264
SUBDIR += libxine

3
multimedia/gstreamermm/Makefile
View file

@ -13,7 +13,8 @@ COMMENT= C++ wrapper library for the multimedia library GStreamer
LICENSE= LGPL21
USES= gmake libtool pathfix pkgconfig tar:xz
USES= compiler:c++11-lang gmake libtool pathfix pkgconfig tar:xz
USE_CXXSTD= c++11
USE_GSTREAMER= theora vorbis cdparanoia gio pango
USE_GNOME= gnomeprefix gtkmm24
GNU_CONFIGURE= yes

3
multimedia/libva-intel-driver/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libva-intel-driver
PORTVERSION= 1.7.3
PORTREVISION= 2
PORTVERSION= 1.8.0
CATEGORIES= multimedia
MAINTAINER= madpilot@FreeBSD.org

6
multimedia/libva-intel-driver/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1487846424
SHA256 (01org-intel-vaapi-driver-1.7.3_GH0.tar.gz) = c1f02cbdf0398f096ddc91096fac6ee62267a54955f6d235d73a8ff2ea888118
SIZE (01org-intel-vaapi-driver-1.7.3_GH0.tar.gz) = 1648659
TIMESTAMP = 1491034980
SHA256 (01org-intel-vaapi-driver-1.8.0_GH0.tar.gz) = 45a38641f3ddbd43d9c053bfd9cb809ecb2d5f5227f0e3c1c5a8d51dccf81b35
SIZE (01org-intel-vaapi-driver-1.8.0_GH0.tar.gz) = 2308240

14
multimedia/libva-intel-driver/files/patch-src-i965_decoder_utils.c
View file

@ -1,14 +0,0 @@
--- src/i965_decoder_utils.c.orig 2014-12-24 00:59:48 UTC
+++ src/i965_decoder_utils.c
@@ -23,7 +23,11 @@
#include "sysdeps.h"
#include <limits.h>
+#ifdef __FreeBSD__
+#include <stdlib.h>
+#else
#include <alloca.h>
+#endif
#include "intel_batchbuffer.h"
#include "intel_media.h"

2
multimedia/libva-intel-driver/pkg-descr
View file

@ -1,4 +1,4 @@
Libva driver for intel graphics cards with hardware accelerated
features for video encode/decode.
WWW: http://cgit.freedesktop.org/vaapi/intel-driver
WWW: https://github.com/01org/intel-vaapi-driver

53
multimedia/libva-utils/Makefile Normal file
View file

@ -0,0 +1,53 @@
# $FreeBSD$
PORTNAME= libva-utils
PORTVERSION= 1.8.0
CATEGORIES= multimedia
MAINTAINER= madpilot@FreeBSD.org
COMMENT= Collection of tests and utilities for VAAPI
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libva.so:multimedia/libva
USES= autoreconf gmake libtool pkgconfig tar:bzip2
#USE_XORG= glproto pciaccess xext xfixes
#USE_GL= gl
GNU_CONFIGURE= yes
USE_GITHUB= yes
GH_ACCOUNT= 01org
#LDFLAGS+= -lpthread
# prevent types conflict: videodev2.h vs. drm.h
#CFLAGS+= -DHAVE_LINUX_INTEGER_TYPES
OPTIONS_DEFINE= DEBUG
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDEBUG}
CFLAGS+= -D_DEBUG
.else
CFLAGS+= -DNDEBUG
.endif
.include <bsd.port.pre.mk>
.if defined(STRIP) && ${STRIP} != ""
INSTALL_TARGET= install-strip
.endif
#post-patch: .SILENT
# ${REINPLACE_CMD} -e 's|\($$libdir\)/dri|\1/va|' \
# -e 's|$${libdir}/\(pkgconfig\)|${PREFIX}/libdata/\1|' \
# ${WRKSRC}/configure.ac
# ${REINPLACE_CMD} -e 's/va\(info\)/\1/g' -e 's/info\.c/vainfo\.c/' \
# ${WRKSRC}/test/vainfo/Makefile.am
# ${REINPLACE_CMD} '/^export VA_HEADER_/d' \
# ${WRKSRC}/doc/Makefile.am
# ${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am
.include <bsd.port.post.mk>

3
multimedia/libva-utils/distinfo Normal file
View file

@ -0,0 +1,3 @@
TIMESTAMP = 1491052388
SHA256 (01org-libva-utils-1.8.0_GH0.tar.gz) = 2a7590c8428d0b453b004702c4c515669403cea27f9f17b2560b38da337ec943
SIZE (01org-libva-utils-1.8.0_GH0.tar.gz) = 1011595

4
multimedia/libva-utils/pkg-descr Normal file
View file

@ -0,0 +1,4 @@
libva-utils is a collection of utilities and examples to exercise
VA-API in accordance with the libva project.
WWW: https://github.com/01org/libva-utils

8
multimedia/libva-utils/pkg-plist Normal file
View file

@ -0,0 +1,8 @@
bin/avcenc
bin/h264encode
bin/vainfo
bin/jpegenc
bin/loadjpeg
bin/mpeg2vaenc
bin/mpeg2vldemo
bin/putsurface

5
multimedia/libva/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libva
PORTVERSION= 1.7.3
PORTVERSION= 1.8.0
CATEGORIES= multimedia
MAINTAINER= madpilot@FreeBSD.org
@ -22,7 +22,6 @@ USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= 01org
GH_TAGNAME= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
LDFLAGS+= -lpthread
# prevent types conflict: videodev2.h vs. drm.h
@ -48,8 +47,6 @@ post-patch: .SILENT
${REINPLACE_CMD} -e 's|\($$libdir\)/dri|\1/va|' \
-e 's|$${libdir}/\(pkgconfig\)|${PREFIX}/libdata/\1|' \
${WRKSRC}/configure.ac
${REINPLACE_CMD} -e 's/va\(info\)/\1/g' -e 's/info\.c/vainfo\.c/' \
${WRKSRC}/test/vainfo/Makefile.am
${REINPLACE_CMD} '/^export VA_HEADER_/d' \
${WRKSRC}/doc/Makefile.am
${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am

6
multimedia/libva/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1487845684
SHA256 (01org-libva-1.7.3-libva-1.7.3_GH0.tar.gz) = f0f816a725007fbf3c7ed816ff71ba420696bec63ff49045e9b23d9b34ac73c8
SIZE (01org-libva-1.7.3-libva-1.7.3_GH0.tar.gz) = 898775
TIMESTAMP = 1491034642
SHA256 (01org-libva-1.8.0_GH0.tar.gz) = 924ed467d50a24018428448071a311d6467e0d40dc94731e2164f9d5d61bac51
SIZE (01org-libva-1.8.0_GH0.tar.gz) = 195261

38
multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp
View file

@ -1,38 +0,0 @@
--- test/v4l_h264/encode/capture.cpp.orig 2016-06-21 01:29:25 UTC
+++ test/v4l_h264/encode/capture.cpp
@@ -30,6 +30,7 @@
*/
#include <cstdlib> /* EXIT_FAILURE, EXIT_SUCCESS */
+#include <cstdio> /* printf */
#include <string>
#include <cstring> /* strerror() */
#include <cassert>
@@ -37,7 +38,11 @@
#include <fcntl.h> /* low-level i/o */
#include <errno.h>
#include <unistd.h>
+#if defined __FreeBSD__ || defined __DragonFly__
+#include <stdlib.h>
+#else
#include <malloc.h>
+#endif
#include <sys/stat.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
@@ -451,10 +456,15 @@ static void init_userp (unsigned int buf
}
for (n_buffers = 0; n_buffers < 4; ++n_buffers) {
buffers[n_buffers].length = buffer_size;
+#if defined __FreeBSD__ || defined __DragonFly__
+ if(posix_memalign(&buffers[n_buffers].start, page_size, buffer_size))
+ {
+#else
buffers[n_buffers].start = memalign (/* boundary */ page_size,
buffer_size);
if (!buffers[n_buffers].start) {
+#endif
std::cerr << "Out of memory\n";
exit (EXIT_FAILURE);
}

2
multimedia/libva/pkg-descr
View file

@ -3,4 +3,4 @@ hardware accelerated video decode/encode at various entry-points (VLD,
IDCT, Motion Compensation etc.) for the prevailing coding standards
today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).
WWW: http://freedesktop.org/wiki/Software/vaapi
WWW: https://github.com/01org/libva

18
multimedia/libva/pkg-plist
View file

@ -1,11 +1,3 @@
bin/vaavcenc
bin/vah264encode
bin/vainfo
bin/vajpegenc
bin/valoadjpeg
bin/vampeg2vaenc
bin/vampeg2vldemo
bin/vaputsurface
include/va/va.h
include/va/va_backend.h
include/va/va_backend_glx.h
@ -33,19 +25,19 @@ include/va/va_vpp.h
include/va/va_x11.h
lib/libva-drm.so
lib/libva-drm.so.1
lib/libva-drm.so.1.3904.0
lib/libva-drm.so.1.4000.0
lib/libva-glx.so
lib/libva-glx.so.1
lib/libva-glx.so.1.3904.0
lib/libva-glx.so.1.4000.0
lib/libva-tpi.so
lib/libva-tpi.so.1
lib/libva-tpi.so.1.3904.0
lib/libva-tpi.so.1.4000.0
lib/libva-x11.so
lib/libva-x11.so.1
lib/libva-x11.so.1.3904.0
lib/libva-x11.so.1.4000.0
lib/libva.so
lib/libva.so.1
lib/libva.so.1.3904.0
lib/libva.so.1.4000.0
lib/va/dummy_drv_video.so
libdata/pkgconfig/libva-drm.pc
libdata/pkgconfig/libva-glx.pc

37
multimedia/libvdpau-va-gl/Makefile Normal file
View file

@ -0,0 +1,37 @@
# $FreeBSD$
PORTNAME= libvdpau-va-gl
PORTVERSION= 0.4.2
DISTVERSIONPREFIX= v
CATEGORIES= multimedia
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES= 58a98e8a735f.patch:-p1
MAINTAINER= madpilot@FreeBSD.org
COMMENT= VDPAU driver with OpenGL/VAAPI backend
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libva-x11.so:multimedia/libva
USE_GITHUB= yes
GH_ACCOUNT= i-rinat
USES= cmake pkgconfig
USE_XORG= x11
USE_GL= gl
LDFLAGS+= -Wl,--as-needed # Xext, ICE, SM
TEST_TARGET= check
PLIST_FILES= lib/vdpau/libvdpau_va_gl.so lib/vdpau/libvdpau_va_gl.so.1
# bug 217825: Convenience symlinks. On AMD prefer VDPAU from Mesa.
PLIST_FILES+= lib/vdpau/libvdpau_i915.so.1 lib/vdpau/libvdpau_i965.so.1
post-install:
.for f in ${PLIST_FILES:N*va_gl*:M*.so.1}
${LN} -sf libvdpau_va_gl.so.1 ${STAGEDIR}${PREFIX}/$f
.endfor
.include <bsd.port.mk>

5
multimedia/libvdpau-va-gl/distinfo Normal file
View file

@ -0,0 +1,5 @@
TIMESTAMP = 1474986072
SHA256 (i-rinat-libvdpau-va-gl-v0.4.2_GH0.tar.gz) = 7d9121540658eb0244859e63da171ca3869e784afbeaf202f44471275c784af4
SIZE (i-rinat-libvdpau-va-gl-v0.4.2_GH0.tar.gz) = 119473
SHA256 (58a98e8a735f.patch) = 0dbd7c1b2f831b74f65d42cd632f680f08b7cf9f5248e7de757df80bab599eb8
SIZE (58a98e8a735f.patch) = 1240

5
multimedia/libvdpau-va-gl/pkg-descr Normal file
View file

@ -0,0 +1,5 @@
The package provides a generic VDPAU driver. It uses OpenGL under the
hood to accelerate drawing, scaling, and (if available) VA-API to
accelerate video decoding.
WWW: https://github.com/i-rinat/libvdpau-va-gl

4
net-im/xmpp-client/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xmpp-client
PORTVERSION= 20160717
PORTVERSION= 20170324
CATEGORIES= net-im
MAINTAINER= cs@FreeBSD.org
@ -14,7 +14,7 @@ BUILD_DEPENDS= ${LOCALBASE}/${GO_LIBDIR}/golang.org/x/crypto/bcrypt.a:security/g
USE_GITHUB= yes
GH_ACCOUNT= agl
GH_TAGNAME= abbf9020393e8caae3e8996a16ce48446e31cf0e
GH_TAGNAME= 3030ad42ee2df255ffc108dc6d04893d9501c863
USES= go
PLIST_FILES= bin/xmpp-client
GO_PKGNAME= github.com/agl/${PORTNAME}

6
net-im/xmpp-client/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1470252820
SHA256 (agl-xmpp-client-20160717-abbf9020393e8caae3e8996a16ce48446e31cf0e_GH0.tar.gz) = 29a7ed8c97d3d313d0979296728d44f94693354d5218e19f29927a1ee57b3678
SIZE (agl-xmpp-client-20160717-abbf9020393e8caae3e8996a16ce48446e31cf0e_GH0.tar.gz) = 38832
TIMESTAMP = 1491145506
SHA256 (agl-xmpp-client-20170324-3030ad42ee2df255ffc108dc6d04893d9501c863_GH0.tar.gz) = 3e231f2eb50db38bc8aa235bb3c59241f6ca977bd8f5f3013a8d6295fcdcb79e
SIZE (agl-xmpp-client-20170324-3030ad42ee2df255ffc108dc6d04893d9501c863_GH0.tar.gz) = 39132

5
net/net6/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= net6
PORTVERSION= 1.3.14
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= net devel
MASTER_SITES= http://releases.0x539.de/net6/
@ -18,7 +18,8 @@ LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USES= cpe libtool pathfix pkgconfig
USES= cpe libtool pathfix pkgconfig compiler:c++11-lang
USE_CXXSTD= c++11
USE_LDCONFIG= yes
CPE_VENDOR= armin_burgmeier

6
net/sobby/Makefile
View file

@ -17,14 +17,12 @@ LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \
libnet6.so:net/net6 \
libxml++-2.6.so:textproc/libxml++26
USES= pkgconfig
USES= localbase pkgconfig compiler:c++11-lang
USE_CXXSTD= c++11
USE_GNOME= glibmm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-zeroconf
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
.include <bsd.port.mk>

13
net/sock/Makefile
View file

@ -2,12 +2,19 @@
# $FreeBSD$
PORTNAME= sock
PORTVERSION= 0.3.2
PORTVERSION= 0.4.2
CATEGORIES= net
MASTER_SITES= http://www.icir.org/christian/downloads/
MASTER_SITES= http://www-cs-students.stanford.edu/~sjac/sock/
MAINTAINER= sjac@cs.stanford.edu
COMMENT= W. Richard Stevens' sock program
COMMENT= W. Richard Stevens' sock program plus IPv6 and SCTP
LICENSE= WRSTEVENS
LICENSE_NAME= WRSTEVENS
LICENSE_FILE= ${WRKSRC}/COPYING
LICENSE_PERMS= dist-mirror pkg-mirror auto-accept
USES= tar:tgz
HAS_CONFIGURE= yes

5
net/sock/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (sock-0.3.2.tar.gz) = 4ddc33767900e7cd0a4cc0f4d808638d7cfcb746c23e12274c8eba0622eee2eb
SIZE (sock-0.3.2.tar.gz) = 113640
TIMESTAMP = 1491161724
SHA256 (sock-0.4.2.tgz) = 42974b5f8f81c534d1e5236628658f6567ac0539c577cbc46d54b5b11d3b582c
SIZE (sock-0.4.2.tgz) = 119882

264
net/sock/files/patch-src__cliopen.c
View file

@ -1,264 +0,0 @@
--- src/cliopen.c.orig 2010-05-28 00:03:25 UTC
+++ src/cliopen.c
@@ -10,42 +10,107 @@
#include "sock.h"
+/*
+ * Try to convert the host name as an IPv4 dotted-decimal number
+ * or an IPv6 address.
+ */
+int convert_host_address(char *host)
+{
+ struct in_addr inaddr;
+ char inaddr_buf[INET6_ADDRSTRLEN];
+
+ if (AF_INET == af_46) {
+ if (inet_pton(AF_INET, host, &inaddr) == 1) {
+ /* IPv4 dotted-decimal */
+ servaddr4.sin_addr = inaddr;
+
+ return (1);
+ }
+ } else {
+ if (inet_pton(AF_INET6, host, inaddr_buf) == 1) {
+ /* IPv6 address */
+ memcpy(&servaddr6.sin6_addr, inaddr_buf,
+ sizeof(struct in6_addr));
+
+ return (1);
+ }
+ }
+
+ return (0);
+}
+
+/*
+ * Try to convert the host name as a host name string.
+ */
+int convert_host_name(char *host)
+{
+ struct hostent *hp;
+
+ if (AF_INET == af_46) {
+ if ( (hp = gethostbyname2(host, AF_INET)) != NULL) {
+ /* IPv4 address */
+ memcpy(&servaddr4.sin_addr, hp->h_addr, hp->h_length);
+
+ return (1);
+ }
+ } else {
+ /*
+ * Fixme: This doesn't work on FreeBSD 8.4.
+ * Only an IPv4 address is returned.
+ * getaddrinfo() doesn't work either.
+ */
+ if ( (hp = gethostbyname2(host, AF_INET6)) != NULL) {
+ /* IPv6 address */
+ memcpy(&servaddr6.sin6_addr, hp->h_addr, hp->h_length);
+
+ return (1);
+ }
+ }
+
+ return (0);
+}
+
int cliopen(char *host, char *port)
{
int fd, i, on;
char *protocol;
- struct in_addr inaddr;
+ char inaddr_buf[INET6_ADDRSTRLEN];
struct servent *sp;
- struct hostent *hp;
+ socklen_t socklen;
protocol = udp ? "udp" : "tcp";
/* initialize socket address structure */
- bzero(&servaddr, sizeof(servaddr));
- servaddr.sin_family = AF_INET;
+ bzero(&servaddr4, sizeof(servaddr4));
+ servaddr4.sin_family = AF_INET;
+
+ bzero(&servaddr6, sizeof(servaddr6));
+ servaddr6.sin6_family = AF_INET6;
/* see if "port" is a service name or number */
if ( (i = atoi(port)) == 0) {
if ( (sp = getservbyname(port, protocol)) == NULL)
- err_quit("getservbyname() error for: %s/%s", port, protocol);
-
- servaddr.sin_port = sp->s_port;
- } else
- servaddr.sin_port = htons(i);
+ err_quit("getservbyname() error for: %s/%s",
+ port, protocol);
+ servaddr4.sin_port = sp->s_port;
+ servaddr6.sin6_port = sp->s_port;
+ } else {
+ servaddr4.sin_port = htons(i);
+ servaddr6.sin6_port = htons(i);
+ }
/*
- * First try to convert the host name as a dotted-decimal number.
- * Only if that fails do we call gethostbyname().
+ * First try to convert the host name as an IPv4 dotted-decimal number
+ * or an IPv6 address. Only if that fails do we try to convert the
+ * host name as a host name string.
*/
-
- if (inet_aton(host, &inaddr) == 1)
- servaddr.sin_addr = inaddr; /* it's dotted-decimal */
- else if ( (hp = gethostbyname(host)) != NULL)
- bcopy(hp->h_addr, &servaddr.sin_addr, hp->h_length);
- else
- err_quit("invalid hostname: %s", host);
+ if (convert_host_address(host) != 1) {
+ if (convert_host_name(host) != 1) {
+ err_quit("invalid hostname: %s", host);
+ }
+ }
- if ( (fd = socket(AF_INET, udp ? SOCK_DGRAM : SOCK_STREAM, 0)) < 0)
+ if ( (fd = socket(af_46, udp ? SOCK_DGRAM : SOCK_STREAM, 0)) < 0)
err_sys("socket() error");
if (reuseaddr) {
@@ -71,21 +136,46 @@ int cliopen(char *host, char *port)
* (and port) using -l option. Allow localip[] to be set but bindport
* to be 0.
*/
-
if (bindport != 0 || localip[0] != 0 || udp) {
- bzero(&cliaddr, sizeof(cliaddr));
- cliaddr.sin_family = AF_INET;
- cliaddr.sin_port = htons(bindport); /* can be 0 */
- if (localip[0] != 0) {
- if (inet_aton(localip, &cliaddr.sin_addr) == 0)
- err_quit("invalid IP address: %s", localip);
- } else
- cliaddr.sin_addr.s_addr = htonl(INADDR_ANY); /* wildcard */
-
- if (bind(fd, (struct sockaddr *) &cliaddr, sizeof(cliaddr)) < 0)
- err_sys("bind() error");
+ if (af_46 == AF_INET) {
+ bzero(&cliaddr4, sizeof(cliaddr4));
+ cliaddr4.sin_family = AF_INET;
+ /* can be 0 */
+ cliaddr4.sin_port = htons(bindport);
+ if (localip[0] != 0) {
+ if (inet_aton(localip, &cliaddr4.sin_addr) == 0)
+ err_quit("invalid IP address: %s",
+ localip);
+ } else {
+ /* wildcard */
+ cliaddr4.sin_addr.s_addr = htonl(INADDR_ANY);
+ }
+ if (bind(fd, (struct sockaddr *) &cliaddr4,
+ sizeof(cliaddr4)) < 0) {
+ err_sys("bind() error");
+ }
+ } else {
+ bzero(&cliaddr6, sizeof(cliaddr6));
+ cliaddr6.sin6_len = sizeof(struct sockaddr_in6);
+ cliaddr6.sin6_family = AF_INET6;
+ /* can be 0 */
+ cliaddr6.sin6_port = htons(bindport);
+
+ /* Fixme: localip not implemented for IPv6 */
+ cliaddr6.sin6_addr = in6addr_any;
+
+ /* Fixme: Want to set IPV6_BINDANY? */
+
+ if (bind(fd, (struct sockaddr *) &cliaddr6,
+ sizeof(cliaddr6)) < 0) {
+ err_sys("bind() error");
+ }
+ }
}
-
+
+ /* Fixme: Does not work */
+ //join_mcast_client(fd, &cliaddr4, &cliaddr6, &servaddr4, &servaddr6);
+
/* Need to allocate buffers before connect(), since they can affect
* TCP options (window scale, etc.).
*/
@@ -96,13 +186,21 @@ int cliopen(char *host, char *port)
/*
* Connect to the server. Required for TCP, optional for UDP.
*/
-
if (udp == 0 || connectudp) {
for ( ; ; ) {
- if (connect(fd, (struct sockaddr *) &servaddr, sizeof(servaddr))
- == 0)
+ if (AF_INET == af_46) {
+ if (connect(fd, (struct sockaddr *) &servaddr4,
+ sizeof(servaddr4)) == 0)
break; /* all OK */
- if (errno == EINTR) /* can happen with SIGIO */
+ } else {
+ servaddr6.sin6_len =
+ sizeof(struct sockaddr_in6);
+ servaddr6.sin6_family = AF_INET6;
+ if (connect(fd, (struct sockaddr *) &servaddr6,
+ sizeof(servaddr6)) == 0)
+ break; /* all OK */
+ }
+ if (errno == EINTR) /* can happen with SIGIO */
continue;
if (errno == EISCONN) /* can happen with SIGIO */
break;
@@ -114,16 +212,38 @@ int cliopen(char *host, char *port)
/* Call getsockname() to find local address bound to socket:
TCP ephemeral port was assigned by connect() or bind();
UDP ephemeral port was assigned by bind(). */
- i = sizeof(cliaddr);
- if (getsockname(fd, (struct sockaddr *) &cliaddr, &i) < 0)
- err_sys("getsockname() error");
-
- /* Can't do one fprintf() since inet_ntoa() stores
- the result in a static location. */
- fprintf(stderr, "connected on %s.%d ",
- INET_NTOA(cliaddr.sin_addr), ntohs(cliaddr.sin_port));
- fprintf(stderr, "to %s.%d\n",
- INET_NTOA(servaddr.sin_addr), ntohs(servaddr.sin_port));
+ if (AF_INET == af_46) {
+ socklen = sizeof(cliaddr4);
+ if (getsockname(fd,
+ (struct sockaddr *) &cliaddr4, &socklen) < 0) {
+ err_sys("getsockname() error");
+ }
+ /* Can't do one fprintf() since inet_ntoa() stores
+ the result in a static location. */
+ fprintf(stderr, "connected on %s.%d ",
+ INET_NTOA(cliaddr4.sin_addr),
+ ntohs(cliaddr4.sin_port));
+ fprintf(stderr, "to %s.%d\n",
+ INET_NTOA(servaddr4.sin_addr),
+ ntohs(servaddr4.sin_port));
+ } else {
+ socklen = sizeof(cliaddr6);
+ if (getsockname(fd,
+ (struct sockaddr *) &cliaddr6, &socklen) < 0) {
+ err_sys("getsockname() error");
+ }
+
+ inet_ntop(AF_INET6,
+ &cliaddr6.sin6_addr.__u6_addr.__u6_addr8,
+ inaddr_buf, sizeof(inaddr_buf));
+ fprintf(stderr, "connected on %s.%d ",
+ inaddr_buf, ntohs(cliaddr6.sin6_port));
+ inet_ntop(AF_INET6,
+ &servaddr6.sin6_addr.__u6_addr.__u6_addr8,
+ inaddr_buf, sizeof(inaddr_buf));
+ fprintf(stderr, "to %s.%d\n",
+ inaddr_buf, ntohs(servaddr6.sin6_port));
+ }
}
sockopts(fd, 1); /* some options get set after connect() */

261
net/sock/files/patch-src__loopudp.c
View file

@ -1,261 +0,0 @@
--- src/loopudp.c.orig 2010-05-28 00:03:25 UTC
+++ src/loopudp.c
@@ -21,17 +21,28 @@
void
loop_udp(int sockfd)
{
- int maxfdp1, nread, ntowrite, stdineof, clilen, servlen, flags;
+ int maxfdp1, nread, ntowrite, stdineof, clilen, flags;
+ socklen_t servlen;
fd_set rset;
- struct sockaddr_in cliaddr; /* for UDP server */
- struct sockaddr_in servaddr; /* for UDP client */
+ struct sockaddr_in cliaddr4; /* for IPv4 UDP server */
+ struct sockaddr_in6 cliaddr6; /* for IPv6 UDP server */
+ /*
+ * The original local variable servaddr, and later servaddr4 and
+ * servaddr6, were not initialized before use. Using the initialized
+ * global sockaddr structs allows the sendto() code, below, to work
+ * correctly. This was a problem with the original IPv4 code, and
+ * later the IPv6 code.
+ */
+ //struct sockaddr_in servaddr4; /* for IPv4 UDP client */
+ //struct sockaddr_in6 servaddr6; /* for IPv6 UDP client */
+ char inaddr_buf[INET6_ADDRSTRLEN];
- struct iovec iov[1];
- struct msghdr msg;
+ struct iovec iov[1];
+ struct msghdr msg;
#ifdef HAVE_MSGHDR_MSG_CONTROL
#ifdef IP_RECVDSTADDR /* 4.3BSD Reno and later */
static struct cmsghdr *cmptr = NULL; /* malloc'ed */
- struct in_addr dstinaddr; /* for UDP server */
+ struct in_addr dstinaddr; /* for UDP server */
#define CONTROLLEN (sizeof(struct cmsghdr) + sizeof(struct in_addr))
#endif /* IP_RECVDSTADDR */
@@ -68,8 +79,10 @@ loop_udp(int sockfd)
err_sys("shutdown() error");
FD_CLR(STDIN_FILENO, &rset);
- stdineof = 1; /* don't read stdin anymore */
- continue; /* back to select() */
+ /* don't read stdin anymore */
+ stdineof = 1;
+ /* back to select() */
+ continue;
}
break; /* default: stdin EOF -> done */
}
@@ -77,23 +90,43 @@ loop_udp(int sockfd)
if (crlf) {
ntowrite = crlf_add(wbuf, writelen, rbuf, nread);
if (connectudp) {
- if (write(sockfd, wbuf, ntowrite) != ntowrite)
+ if (write(sockfd, wbuf, ntowrite) !=
+ ntowrite) {
err_sys("write error");
+ }
} else {
- if (sendto(sockfd, wbuf, ntowrite, 0,
- (struct sockaddr *) &servaddr, sizeof(servaddr))
- != ntowrite)
- err_sys("sendto error");
+ if (af_46 == AF_INET) {
+ if (sendto(sockfd, wbuf, ntowrite, 0,
+ (struct sockaddr *)&servaddr4,
+ sizeof(servaddr4)) != ntowrite) {
+ err_sys("sendto error");
+ }
+ } else {
+ if (sendto(sockfd, wbuf, ntowrite, 0,
+ (struct sockaddr *)&servaddr6,
+ sizeof(servaddr6)) != ntowrite) {
+ err_sys("sendto error");
+ }
+ }
}
} else {
if (connectudp) {
if (write(sockfd, rbuf, nread) != nread)
err_sys("write error");
} else {
- if (sendto(sockfd, rbuf, nread, 0,
- (struct sockaddr *) &servaddr, sizeof(servaddr))
- != nread)
- err_sys("sendto error");
+ if (af_46 == AF_INET) {
+ if (sendto(sockfd, rbuf, nread, 0,
+ (struct sockaddr *)&servaddr4,
+ sizeof(servaddr4)) != nread) {
+ err_sys("sendto error");
+ }
+ } else {
+ if (sendto(sockfd, rbuf, nread, 0,
+ (struct sockaddr *)&servaddr6,
+ sizeof(servaddr6)) != nread) {
+ err_sys("sendto error");
+ }
+ }
}
}
}
@@ -101,35 +134,54 @@ loop_udp(int sockfd)
if (FD_ISSET(sockfd, &rset)) {
/* data to read from socket */
if (server) {
- clilen = sizeof(cliaddr);
-#ifndef MSG_TRUNC /* vanilla BSD sockets */
+ if (af_46 == AF_INET) {
+ clilen = sizeof(cliaddr4);
+ } else {
+ clilen = sizeof(cliaddr6);
+ }
+
+#ifndef MSG_TRUNC /* vanilla BSD sockets */
+
+ /* Fixme: Not ported for IPv6 */
+ /* Not compiled in for FreeBSD 8.4 */
nread = recvfrom(sockfd, rbuf, readlen, 0,
- (struct sockaddr *) &cliaddr, &clilen);
-
+ (struct sockaddr *) &cliaddr4, &clilen);
+
#else /* 4.3BSD Reno and later; use recvmsg() to get at MSG_TRUNC flag */
- /* Also lets us get at control information (destination address) */
-
+ /* Also lets us get at control information (destination address) */
+
+ /* FreeBSD 8.4 */
iov[0].iov_base = rbuf;
iov[0].iov_len = readlen;
- msg.msg_iov = iov;
- msg.msg_iovlen = 1;
- msg.msg_name = (caddr_t) &cliaddr;
- msg.msg_namelen = clilen;
-
+ msg.msg_iov = iov;
+ msg.msg_iovlen = 1;
+ if (af_46 == AF_INET) {
+ msg.msg_name = (caddr_t) &cliaddr4;
+ } else {
+ msg.msg_name = (caddr_t) &cliaddr6;
+ }
+ msg.msg_namelen = clilen;
+
#ifdef HAVE_MSGHDR_MSG_CONTROL
#ifdef IP_RECVDSTADDR
+ /* FreeBSD 8.4 */
if (cmptr == NULL && (cmptr = malloc(CONTROLLEN)) == NULL)
err_sys("malloc error for control buffer");
- msg.msg_control = (caddr_t) cmptr; /* for dest address */
+ /* for dest address */
+ msg.msg_control = (caddr_t) cmptr;
msg.msg_controllen = CONTROLLEN;
#else
- msg.msg_control = (caddr_t) 0; /* no ancillary data */
+ /* Not used for FreeBSD 8.4 */
+ /* no ancillary data */
+ msg.msg_control = (caddr_t) 0;
msg.msg_controllen = 0;
#endif /* IP_RECVDSTADDR */
#endif
#ifdef HAVE_MSGHDR_MSG_FLAGS
- msg.msg_flags = 0; /* flags returned here */
+ /* FreeBSD 8.4 */
+ /* flags returned here */
+ msg.msg_flags = 0;
#endif
nread = recvmsg(sockfd, &msg, 0);
#endif /* MSG_TRUNC */
@@ -137,22 +189,39 @@ loop_udp(int sockfd)
err_sys("datagram receive error");
if (verbose) {
- printf("from %s", INET_NTOA(cliaddr.sin_addr));
+ if (af_46 == AF_INET) {
+ printf("from %s",
+ INET_NTOA(cliaddr4.sin_addr));
+ } else {
+ inet_ntop(AF_INET6,
+ &cliaddr6.sin6_addr.
+ __u6_addr.__u6_addr8,
+ inaddr_buf,
+ sizeof(inaddr_buf));
+ printf("from %s", inaddr_buf);
+ }
#ifdef HAVE_MSGHDR_MSG_CONTROL
#ifdef IP_RECVDSTADDR
+ /*
+ * Fixme: not ported for IPv6
+ * Fixme: recvdstaddr fails (earlier,
+ * in setsockopt()) for IPv6 under
+ * FreeBSD 8.4
+ */
if (recvdstaddr) {
if (cmptr->cmsg_len != CONTROLLEN)
err_quit("control length (%d) != %d",
- cmptr->cmsg_len, CONTROLLEN);
+ cmptr->cmsg_len, CONTROLLEN);
if (cmptr->cmsg_level != IPPROTO_IP)
err_quit("control level != IPPROTO_IP");
if (cmptr->cmsg_type != IP_RECVDSTADDR)
err_quit("control type != IP_RECVDSTADDR");
bcopy(CMSG_DATA(cmptr), &dstinaddr,
- sizeof(struct in_addr));
+ sizeof(struct in_addr));
bzero(cmptr, CONTROLLEN);
- printf(", to %s", INET_NTOA(dstinaddr));
+ printf(", to %s",
+ INET_NTOA(dstinaddr));
}
#endif /* IP_RECVDSTADDR */
#endif /* HAVE_MSGHDR_MSG_CONTROL */
@@ -178,15 +247,37 @@ loop_udp(int sockfd)
}
} else {
- /* Must use recvfrom() for unconnected UDP client */
- servlen = sizeof(servaddr);
- nread = recvfrom(sockfd, rbuf, readlen, 0,
- (struct sockaddr *) &servaddr, &servlen);
- if (nread < 0)
+ /*
+ * Must use recvfrom() for unconnected
+ * UDP client
+ */
+ /* Fixme: not tested on FreeBSD 8.4 */
+ if (af_46 == AF_INET) {
+ servlen = sizeof(servaddr4);
+ nread = recvfrom(sockfd, rbuf, readlen,
+ 0, (struct sockaddr *)&servaddr4,
+ &servlen);
+ } else {
+ servlen = sizeof(servaddr6);
+ nread = recvfrom(sockfd, rbuf, readlen,
+ 0, (struct sockaddr *)&servaddr6,
+ &servlen);
+ }
+ if (nread < 0) {
err_sys("datagram recvfrom() error");
-
+ }
if (verbose) {
- printf("from %s", INET_NTOA(servaddr.sin_addr));
+ if (af_46 == AF_INET) {
+ printf("from %s",
+ INET_NTOA(servaddr4.sin_addr));
+ } else {
+ inet_ntop(AF_INET6,
+ &servaddr6.sin6_addr.
+ __u6_addr.__u6_addr8,
+ inaddr_buf,
+ sizeof(inaddr_buf));
+ printf("from %s", inaddr_buf);
+ }
printf(": ");
fflush(stdout);
}

60
net/sock/files/patch-src__main.c
View file

@ -1,60 +0,0 @@
--- src/main.c.orig 2010-05-28 00:03:25 UTC
+++ src/main.c
@@ -23,9 +23,10 @@
char *host; /* hostname or dotted-decimal string */
char *port;
- /* DefinE global variables */
+ /* Define global variables */
+int af_46 = AF_INET; /* AF_INET or AF_INET6 */
int bindport; /* 0 or TCP or UDP port number to bind */
- /* set by -b or -l options */
+ /* set by -b or -l options */
int broadcast; /* SO_BROADCAST */
int cbreak; /* set terminal to cbreak mode */
int chunkwrite; /* write in small chunks; not all-at-once */
@@ -76,7 +77,8 @@ int urgwrite; /* write urgent byte af
int verbose; /* each -v increments this by 1 */
int usewritev; /* use writev() instead of write() */
-struct sockaddr_in cliaddr, servaddr;
+struct sockaddr_in cliaddr4, servaddr4;
+struct sockaddr_in6 cliaddr6, servaddr6;
static void usage(const char *);
@@ -90,13 +92,16 @@ main(int argc, char *argv[])
usage("");
opterr = 0; /* don't want getopt() writing to stderr */
- while ( (c = getopt(argc, argv, "2b:cf:g:hij:kl:n:op:q:r:st:uvw:x:y:ABCDEFG:H:IJ:KL:NO:P:Q:R:S:TU:VWX:YZ")) != -1) {
+ while ( (c = getopt(argc, argv, "26b:cf:g:hij:kl:n:op:q:r:st:uvw:x:y:ABCDEFG:H:IJ:KL:NO:P:Q:R:S:TU:VWX:YZ")) != -1) {
switch (c) {
#ifdef IP_ONESBCAST
case '2': /* use 255.255.255.255 as broadcast address */
onesbcast = 1;
break;
#endif
+ case '6': /* use IPv6 */
+ af_46 = AF_INET6;
+ break;
case 'b':
bindport = atoi(optarg);
@@ -309,7 +314,7 @@ main(int argc, char *argv[])
}
}
- /* check for options that don't make sense */
+ /* check for options that don't make sense */
if (udp && halfclose)
usage("can't specify -h and -u");
if (udp && debug)
@@ -439,6 +444,7 @@ usage(const char *msg)
#ifdef IP_ONESBCAST
" -2 IP_ONESBCAST option (255.255.255.255 for broadcast\n"
#endif
+" -6 use IPv6 instead of IPv4\n"
);
if (msg[0] != 0)

111
net/sock/files/patch-src__multicast.c
View file

@ -1,111 +0,0 @@
--- src/multicast.c.orig 2010-05-28 00:03:25 UTC
+++ src/multicast.c
@@ -10,24 +10,96 @@
#include "sock.h"
+/*
+ * Works for IPv4 and IPv6.
+ * For IPv4, the server is able to join a multicast group such as 224.0.0.1.
+ * The client is able to connect to the same multicast address and port
+ * assigned to the server. The client can then send data, which the server
+ * receives.
+ * For IPv6, the server is able to join a multicast group of the form ff02::n.
+ * The client is never able to connect to that address/port, however.
+ */
void
-join_mcast(int fd, struct sockaddr_in *sin)
+join_mcast_server(int fd, struct sockaddr_in *sin, struct sockaddr_in6 *sin6)
{
#ifdef IP_ADD_MEMBERSHIP /* only include if host supports mcasting */
- u_long inaddr;
- struct ip_mreq mreq;
+ u_long inaddr;
+ struct ip_mreq mreq;
+ struct ipv6_mreq mreq6;
- inaddr = sin->sin_addr.s_addr;
- if (IN_MULTICAST(inaddr) == 0)
- return; /* not a multicast address */
+ if (af_46 == AF_INET) {
+ inaddr = sin->sin_addr.s_addr;
+ /*
+ * FreeBSD 8.4: IN_MULTICAST() test fails in the original code
+ * because it was testing inaddr with the wrong endianness.
+ * Fixed in this version of the code, at least for FreeBSD.
+ */
+ inaddr = ntohl(inaddr);
- mreq.imr_multiaddr.s_addr = inaddr;
- mreq.imr_interface.s_addr = htonl(INADDR_ANY); /* need way to change */
- if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq,
- sizeof(mreq)) == -1 )
- err_sys("IP_ADD_MEMBERSHIP error");
+ if (IN_MULTICAST(inaddr) == 0) {
+ return; /* not a multicast address */
+ }
+ } else {
+ if (IN6_IS_ADDR_MULTICAST(&(sin6->sin6_addr)) == 0) {
+ return; /* not a multicast address */
+ }
+ }
+
+ if (af_46 == AF_INET) {
+ mreq.imr_multiaddr.s_addr = sin->sin_addr.s_addr;
+ /* need way to change */
+ mreq.imr_interface.s_addr = htonl(INADDR_ANY);
+ if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq,
+ sizeof(mreq)) == -1 ) {
+ err_sys("IP_ADD_MEMBERSHIP error");
+ }
+ } else {
+ memset((char *)&mreq6, 0, sizeof(mreq6));
+ mreq6.ipv6mr_multiaddr = sin6->sin6_addr;
+ mreq6.ipv6mr_interface = sin6->sin6_scope_id;
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq6,
+ sizeof(mreq6)) == -1 ) {
+ err_sys("IP_ADD_MEMBERSHIP error");
+ }
+ }
if (verbose)
- fprintf(stderr, "multicast group joined\n");
+ fprintf(stderr, "multicast group joined\n");
+#endif /* IP_ADD_MEMBERSHIP */
+}
+
+/*
+ * Added for IPv6. Fixme: Does not work at present.
+ * The client is currently unable to connect to the multicast address/port
+ * which was joined by the server. A function similar to this may be needed
+ * to permit that connection to be made.
+ */
+void
+join_mcast_client(int fd,
+ struct sockaddr_in *cli_sin, struct sockaddr_in6 *cli_sin6,
+ struct sockaddr_in *serv_sin, struct sockaddr_in6 *serv_sin6)
+{
+#ifdef IP_ADD_MEMBERSHIP /* only include if host supports mcasting */
+ struct ipv6_mreq mreq6;
+
+ if (af_46 == AF_INET6) {
+ if (IN6_IS_ADDR_MULTICAST(&(serv_sin6->sin6_addr)) == 0) {
+ return; /* not a multicast address */
+ }
+ }
+
+ if (af_46 == AF_INET6) {
+ memset((char *)&mreq6, 0, sizeof(mreq6));
+ mreq6.ipv6mr_multiaddr = serv_sin6->sin6_addr;
+ mreq6.ipv6mr_interface = serv_sin6->sin6_scope_id;
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq6,
+ sizeof(mreq6)) == -1 ) {
+ err_sys("IP_ADD_MEMBERSHIP error");
+ }
+ }
+
+ if (verbose) {
+ fprintf(stderr, "multicast group joined\n");
+ }
#endif /* IP_ADD_MEMBERSHIP */
}

282
net/sock/files/patch-src__servopen.c
View file

@ -1,282 +0,0 @@
--- src/servopen.c.orig 2010-05-28 00:03:25 UTC
+++ src/servopen.c
@@ -19,38 +19,67 @@
int
servopen(char *host, char *port)
{
- int fd, newfd, i, on, pid;
- char *protocol;
+ int fd, newfd, i, on, pid;
+ char *protocol;
struct in_addr inaddr;
struct servent *sp;
+ socklen_t len;
+ char inaddr_buf[INET6_ADDRSTRLEN];
protocol = udp ? "udp" : "tcp";
- /* Initialize the socket address structure */
- bzero(&servaddr, sizeof(servaddr));
- servaddr.sin_family = AF_INET;
+ /* Initialize the socket address structure */
+ bzero(&servaddr4, sizeof(servaddr4));
+ servaddr4.sin_family = AF_INET;
- /* Caller normally wildcards the local Internet address, meaning
- a connection will be accepted on any connected interface.
- We only allow an IP address for the "host", not a name. */
- if (host == NULL)
- servaddr.sin_addr.s_addr = htonl(INADDR_ANY); /* wildcard */
- else {
- if (inet_aton(host, &inaddr) == 0)
- err_quit("invalid host name for server: %s", host);
- servaddr.sin_addr = inaddr;
+ bzero(&servaddr6, sizeof(servaddr6));
+ servaddr6.sin6_family = AF_INET6;
+
+ /*
+ * Caller normally wildcards the local Internet address, meaning
+ * a connection will be accepted on any connected interface.
+ * We only allow an IP address for the "host", not a name.
+ */
+ if (host == NULL) {
+ if (AF_INET == af_46) {
+ /* wildcard */
+ servaddr4.sin_addr.s_addr = htonl(INADDR_ANY);
+ } else {
+ /* wildcard */
+ servaddr6.sin6_addr = in6addr_any;
+ }
+ } else {
+ if (AF_INET == af_46) {
+ if (inet_pton(AF_INET, host, &inaddr) == 0) {
+ err_quit("invalid host name for server: %s",
+ host);
+ }
+ /* IPv4 address */
+ servaddr4.sin_addr = inaddr;
+ } else {
+ if (inet_pton(AF_INET6, host, inaddr_buf) == 0) {
+ err_quit("invalid host name for server: %s",
+ host);
+ }
+ /* IPv6 address */
+ memcpy(&servaddr6.sin6_addr, inaddr_buf,
+ sizeof(struct in6_addr));
+ }
}
- /* See if "port" is a service name or number */
+ /* See if "port" is a service name or number */
if ( (i = atoi(port)) == 0) {
if ( (sp = getservbyname(port, protocol)) == NULL)
- err_ret("getservbyname() error for: %s/%s", port, protocol);
-
- servaddr.sin_port = sp->s_port;
- } else
- servaddr.sin_port = htons(i);
+ err_ret("getservbyname() error for: %s/%s", port,
+ protocol);
+ servaddr4.sin_port = sp->s_port;
+ servaddr6.sin6_port = sp->s_port;
+ } else {
+ servaddr4.sin_port = htons(i);
+ servaddr6.sin6_port = htons(i);
+ }
- if ( (fd = socket(AF_INET, udp ? SOCK_DGRAM : SOCK_STREAM, 0)) < 0)
+ if ( (fd = socket(af_46, udp ? SOCK_DGRAM : SOCK_STREAM, 0)) < 0)
err_sys("socket() error");
if (reuseaddr) {
@@ -67,28 +96,37 @@ servopen(char *host, char *port)
}
#endif
- /* Bind our well-known port so the client can connect to us. */
- if (bind(fd, (struct sockaddr *) &servaddr, sizeof(servaddr)) < 0)
- err_sys("can't bind local address");
+ /* Bind our well-known port so the client can connect to us. */
+ if (AF_INET == af_46) {
+ if (bind(fd, (struct sockaddr *) &servaddr4,
+ sizeof(servaddr4)) < 0) {
+ err_sys("can't bind local address");
+ }
+ } else {
+ if (bind(fd, (struct sockaddr *) &servaddr6,
+ sizeof(servaddr6)) < 0) {
+ err_sys("can't bind local address");
+ }
+ }
- join_mcast(fd, &servaddr);
+ join_mcast_server(fd, &servaddr4, &servaddr6);
if (udp) {
buffers(fd);
- if (foreignip[0] != 0) { /* connect to foreignip/port# */
- bzero(&cliaddr, sizeof(cliaddr));
- if (inet_aton(foreignip, &cliaddr.sin_addr) == 0)
+ /* Fixme: Not ported for IPv6 */
+ if (foreignip[0] != 0) { /* connect to foreignip/port# */
+ bzero(&cliaddr4, sizeof(cliaddr4));
+ if (inet_aton(foreignip, &cliaddr4.sin_addr) == 0)
err_quit("invalid IP address: %s", foreignip);
- cliaddr.sin_family = AF_INET;
- cliaddr.sin_port = htons(foreignport);
- /* connect() for datagram socket doesn't appear to allow
- wildcarding of either IP address or port number */
+ cliaddr4.sin_family = AF_INET;
+ cliaddr4.sin_port = htons(foreignport);
+ /* connect() for datagram socket doesn't appear to allow
+ wildcarding of either IP address or port number */
- if (connect(fd, (struct sockaddr *) &cliaddr, sizeof(cliaddr))
- < 0)
+ if (connect(fd, (struct sockaddr *) &cliaddr4,
+ sizeof(cliaddr4)) < 0)
err_sys("connect() error");
-
}
sockopts(fd, 1);
@@ -96,58 +134,108 @@ servopen(char *host, char *port)
return(fd); /* nothing else to do */
}
- buffers(fd); /* may set receive buffer size; must do here to get
- correct window advertised on SYN */
+ buffers(fd); /* may set receive buffer size; must do here to
+ get correct window advertised on SYN */
sockopts(fd, 0); /* only set some socket options for fd */
listen(fd, listenq);
- if (pauselisten)
- sleep_us(pauselisten*1000); /* lets connection queue build up */
+ if (pauselisten) {
+ /* lets connection queue build up */
+ sleep_us(pauselisten*1000);
+ }
- if (dofork)
- TELL_WAIT(); /* initialize synchronization primitives */
+ if (dofork) {
+ /* initialize synchronization primitives */
+ TELL_WAIT();
+ }
for ( ; ; ) {
- i = sizeof(cliaddr);
- if ( (newfd = accept(fd, (struct sockaddr *) &cliaddr, &i)) < 0)
- err_sys("accept() error");
+ if (AF_INET == af_46) {
+ len = sizeof(cliaddr4);
+ if ( (newfd = accept(fd, (struct sockaddr *) &cliaddr4,
+ &len)) < 0) {
+ err_sys("accept() error");
+ }
+ } else {
+ len = sizeof(cliaddr6);
+ if ( (newfd = accept(fd, (struct sockaddr *) &cliaddr6,
+ &len)) < 0) {
+ err_sys("accept() error");
+ }
+ }
if (dofork) {
if ( (pid = fork()) < 0)
err_sys("fork error");
if (pid > 0) {
- close(newfd); /* parent closes connected socket */
- WAIT_CHILD(); /* wait for child to output to terminal */
- continue; /* and back to for(;;) for another accept() */
+ /* parent closes connected socket */
+ close(newfd);
+ /* wait for child to output to terminal */
+ WAIT_CHILD();
+ /* and back to for(;;) for another accept() */
+ continue;
} else {
- close(fd); /* child closes listening socket */
+ /* child closes listening socket */
+ close(fd);
}
}
- /* child (or iterative server) continues here */
+ /* child (or iterative server) continues here */
if (verbose) {
- /* Call getsockname() to find local address bound to socket:
- local internet address is now determined (if multihomed). */
- i = sizeof(servaddr);
- if (getsockname(newfd, (struct sockaddr *) &servaddr, &i) < 0)
- err_sys("getsockname() error");
+ /*
+ * Call getsockname() to find local address bound
+ * to socket: local internet address is now
+ * determined (if multihomed).
+ */
+ if (AF_INET == af_46) {
+ len = sizeof(servaddr4);
+ if (getsockname(newfd,
+ (struct sockaddr *)&servaddr4, &len) < 0) {
+ err_sys("getsockname() error");
+ }
- /* Can't do one fprintf() since inet_ntoa() stores
- the result in a static location. */
- fprintf(stderr, "connection on %s.%d ",
- INET_NTOA(servaddr.sin_addr), ntohs(servaddr.sin_port));
- fprintf(stderr, "from %s.%d\n",
- INET_NTOA(cliaddr.sin_addr), ntohs(cliaddr.sin_port));
+ /*
+ * Can't do one fprintf() since inet_ntoa()
+ * stores the result in a static location.
+ */
+ fprintf(stderr, "connection on %s.%d ",
+ INET_NTOA(servaddr4.sin_addr),
+ ntohs(servaddr4.sin_port));
+ fprintf(stderr, "from %s.%d\n",
+ INET_NTOA(cliaddr4.sin_addr),
+ ntohs(cliaddr4.sin_port));
+ } else {
+ len = sizeof(servaddr6);
+ if (getsockname(newfd,
+ (struct sockaddr *)&servaddr6, &len) < 0) {
+ err_sys("getsockname() error");
+ }
+ inet_ntop(AF_INET6,
+ &servaddr6.sin6_addr.__u6_addr.__u6_addr8,
+ inaddr_buf, sizeof(inaddr_buf));
+ fprintf(stderr, "connection on %s.%d ",
+ inaddr_buf, ntohs(servaddr6.sin6_port));
+ inet_ntop(AF_INET6,
+ &cliaddr6.sin6_addr.__u6_addr.__u6_addr8,
+ inaddr_buf, sizeof(inaddr_buf));
+ fprintf(stderr, "from %s.%d\n",
+ inaddr_buf, ntohs(cliaddr6.sin6_port));
+ }
}
- buffers(newfd); /* setsockopt() again, in case it didn't propagate
- from listening socket to connected socket */
- sockopts(newfd, 1); /* can set all socket options for this socket */
+ /* setsockopt() again, in case it didn't propagate
+ from listening socket to connected socket */
+ buffers(newfd);
- if (dofork)
- TELL_PARENT(getppid()); /* tell parent we're done with terminal */
+ /* can set all socket options for this socket */
+ sockopts(newfd, 1);
+
+ if (dofork) {
+ /* tell parent we're done with terminal */
+ TELL_PARENT(getppid());
+ }
return(newfd);
}

30
net/sock/files/patch-src__sock.h
View file

@ -1,30 +0,0 @@
--- src/sock.h.orig 2010-05-28 00:03:25 UTC
+++ src/sock.h
@@ -62,6 +62,7 @@ extern int errno;
#define max(a,b) ((a) > (b) ? (a) : (b))
/* declare global variables */
+extern int af_46;
extern int bindport;
extern int broadcast;
extern int cbreak;
@@ -114,6 +115,8 @@ extern int verbose;
extern int usewritev;
extern struct sockaddr_in cliaddr, servaddr;
+extern struct sockaddr_in cliaddr4, servaddr4;
+extern struct sockaddr_in6 cliaddr6, servaddr6;
/* Earlier versions of gcc under SunOS 4.x have problems passing arguments
that are structs (as opposed to pointers to structs). This shows up
@@ -130,7 +133,9 @@ void buffers(int);
int cliopen(char *, char *);
int crlf_add(char *, int, const char *, int);
int crlf_strip(char *, int, const char *, int);
-void join_mcast(int, struct sockaddr_in *);
+void join_mcast_server(int, struct sockaddr_in *, struct sockaddr_in6 *);
+void join_mcast_client(int, struct sockaddr_in *, struct sockaddr_in6 *,
+ struct sockaddr_in *, struct sockaddr_in6 *);
void loop_tcp(int);
void loop_udp(int);
void pattern(char *, int);

122
net/sock/files/patch-src__sockopts.c
View file

@ -1,122 +0,0 @@
--- src/sockopts.c.orig 2010-05-28 00:03:25 UTC
+++ src/sockopts.c
@@ -30,6 +30,13 @@ sockopts(int sockfd, int doall)
unsigned optlen;
struct linger ling;
struct timeval timer;
+ int level;
+
+ if (AF_INET == af_46) {
+ level = IPPROTO_IP;
+ } else {
+ level = IPPROTO_IPV6;
+ }
/* "doall" is 0 for a server's listening socket (i.e., before
accept() has returned.) Some socket options such as SO_KEEPALIVE
@@ -73,13 +80,13 @@ sockopts(int sockfd, int doall)
#ifdef IP_TOS
if (iptos != -1 && doall == 0) {
- if (setsockopt(sockfd, IPPROTO_IP, IP_TOS,
+ if (setsockopt(sockfd, level, IP_TOS,
&iptos, sizeof(iptos)) < 0)
err_sys("IP_TOS setsockopt error");
option = 0;
optlen = sizeof(option);
- if (getsockopt(sockfd, IPPROTO_IP, IP_TOS,
+ if (getsockopt(sockfd, level, IP_TOS,
&option, &optlen) < 0)
err_sys("IP_TOS getsockopt error");
if (option != iptos)
@@ -92,13 +99,13 @@ sockopts(int sockfd, int doall)
#ifdef IP_TTL
if (ipttl != -1 && doall == 0) {
- if (setsockopt(sockfd, IPPROTO_IP, IP_TTL,
+ if (setsockopt(sockfd, level, IP_TTL,
&ipttl, sizeof(ipttl)) < 0)
err_sys("IP_TTL setsockopt error");
option = 0;
optlen = sizeof(option);
- if (getsockopt(sockfd, IPPROTO_IP, IP_TTL,
+ if (getsockopt(sockfd, level, IP_TTL,
&option, &optlen) < 0)
err_sys("IP_TTL getsockopt error");
if (option != ipttl)
@@ -150,13 +157,13 @@ sockopts(int sockfd, int doall)
#ifdef IP_ONESBCAST
if (onesbcast) {
option = 1;
- if (setsockopt(sockfd, IPPROTO_IP, IP_ONESBCAST,
+ if (setsockopt(sockfd, level, IP_ONESBCAST,
&option, sizeof(option)) < 0)
err_sys("IP_ONESBCAST setsockopt error");
option = 0;
optlen = sizeof(option);
- if (getsockopt(sockfd, IPPROTO_IP, IP_ONESBCAST,
+ if (getsockopt(sockfd, level, IP_ONESBCAST,
&option, &optlen) < 0)
err_sys("IP_ONESBCAST getsockopt error");
if (option == 0)
@@ -175,7 +182,7 @@ sockopts(int sockfd, int doall)
if (inet_aton(joinip, &join.imr_multiaddr) == 0)
err_quit("invalid multicast address: %s", joinip);
join.imr_interface.s_addr = htonl(INADDR_ANY);
- if (setsockopt(sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+ if (setsockopt(sockfd, level, IP_ADD_MEMBERSHIP,
&join, sizeof(join)) < 0)
err_sys("IP_ADD_MEMBERSHIP setsockopt error");
@@ -188,12 +195,12 @@ sockopts(int sockfd, int doall)
if (mcastttl) {
u_char ttl = mcastttl;
- if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL,
+ if (setsockopt(sockfd, level, IP_MULTICAST_TTL,
&ttl, sizeof(ttl)) < 0)
err_sys("IP_MULTICAST_TTL setsockopt error");
optlen = sizeof(ttl);
- if (getsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL,
+ if (getsockopt(sockfd, level, IP_MULTICAST_TTL,
&ttl, &optlen) < 0)
err_sys("IP_MULTICAST_TTL getsockopt error");
if (ttl != mcastttl)
@@ -288,7 +295,7 @@ sockopts(int sockfd, int doall)
if (verbose)
fprintf(stderr, "SO_RCVTIMEO: %ld.%06ld\n",
- timer.tv_sec, timer.tv_usec);
+ (long)timer.tv_sec, timer.tv_usec);
#else
fprintf(stderr, "warning: SO_RCVTIMEO not supported by host\n");
#endif
@@ -311,7 +318,7 @@ sockopts(int sockfd, int doall)
if (verbose)
fprintf(stderr, "SO_SNDTIMEO: %ld.%06ld\n",
- timer.tv_sec, timer.tv_usec);
+ (long)timer.tv_sec, timer.tv_usec);
#else
fprintf(stderr, "warning: SO_SNDTIMEO not supported by host\n");
#endif
@@ -320,13 +327,13 @@ sockopts(int sockfd, int doall)
if (recvdstaddr && udp) {
#ifdef IP_RECVDSTADDR
option = 1;
- if (setsockopt(sockfd, IPPROTO_IP, IP_RECVDSTADDR,
+ if (setsockopt(sockfd, level, IP_RECVDSTADDR,
&option, sizeof(option)) < 0)
err_sys("IP_RECVDSTADDR setsockopt error");
option = 0;
optlen = sizeof(option);
- if (getsockopt(sockfd, IPPROTO_IP, IP_RECVDSTADDR,
+ if (getsockopt(sockfd, level, IP_RECVDSTADDR,
&option, &optlen) < 0)
err_sys("IP_RECVDSTADDR getsockopt error");
if (option == 0)

16
net/sock/files/patch-src__sourceroute.c
View file

@ -1,16 +0,0 @@
--- src/sourceroute.c.orig 2010-05-28 00:03:25 UTC
+++ src/sourceroute.c
@@ -88,10 +88,11 @@ sroute_set(int sockfd)
sroute_opt[1] = 3 + (sroute_cnt * 4); /* total length, incl. destination */
/* destination must be stored as final entry */
- bcopy(&servaddr.sin_addr, optr, sizeof(u_long));
+ bcopy(&servaddr4.sin_addr, optr, sizeof(u_long));
optr += sizeof(u_long);
if (verbose) {
- fprintf(stderr, "source route to %s\n", inet_ntoa(servaddr.sin_addr));
+ fprintf(stderr, "source route to %s\n",
+ inet_ntoa(servaddr4.sin_addr));
fprintf(stderr, "source route size %d bytes\n", sroute_opt[1]);
}

62
net/sock/files/patch-src__sourceudp.c
View file

@ -1,62 +0,0 @@
--- src/sourceudp.c.orig 2010-05-28 00:03:25 UTC
+++ src/sourceudp.c
@@ -29,28 +29,41 @@ source_udp(int sockfd) /* TODO: use send
if (connectudp) {
if ( (n = write(sockfd, wbuf, writelen)) != writelen) {
if (ignorewerr) {
- err_ret("write returned %d, expected %d", n, writelen);
- /* also call getsockopt() to clear so_error */
+ err_ret("write returned %d, expected %d",
+ n, writelen);
+ /* also call getsockopt() to clear so_error */
optlen = sizeof(option);
- if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR,
- &option, &optlen) < 0)
- err_sys("SO_ERROR getsockopt error");
- } else
- err_sys("write returned %d, expected %d", n, writelen);
+ if (getsockopt(sockfd, SOL_SOCKET,
+ SO_ERROR, &option, &optlen) < 0)
+ err_sys("SO_ERROR getsockopt error");
+ } else {
+ err_sys("write returned %d, expected %d",
+ n, writelen);
+ }
}
} else {
- if ( (n = sendto(sockfd, wbuf, writelen, 0,
- (struct sockaddr *) &servaddr,
- sizeof(struct sockaddr))) != writelen) {
- if (ignorewerr) {
- err_ret("sendto returned %d, expected %d", n, writelen);
- /* also call getsockopt() to clear so_error */
+ if (af_46 == AF_INET) {
+ n = sendto(sockfd, wbuf, writelen, 0,
+ (struct sockaddr *) &servaddr4,
+ sizeof(servaddr4));
+ } else {
+ n = sendto(sockfd, wbuf, writelen, 0,
+ (struct sockaddr *) &servaddr6,
+ sizeof(servaddr6));
+ }
+ if (n != writelen) {
+ if (ignorewerr) {
+ err_ret("sendto returned %d, expected %d",
+ n, writelen);
+ /* also call getsockopt() to clear so_error */
optlen = sizeof(option);
- if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR,
- &option, &optlen) < 0)
- err_sys("SO_ERROR getsockopt error");
- } else
- err_sys("sendto returned %d, expected %d", n, writelen);
+ if (getsockopt(sockfd, SOL_SOCKET,
+ SO_ERROR, &option, &optlen) < 0)
+ err_sys("SO_ERROR getsockopt error");
+ } else {
+ err_sys("sendto returned %d, expected %d",
+ n, writelen);
+ }
}
}

30
net/sock/pkg-descr
View file

@ -1,17 +1,21 @@
This is a standalone version of W. Richard Stevens' "sock" program,
based on the code available for the UNIX Network Programming book.
Adapted and reworked code for W. Richard Stevens' "sock" utility
by Christian Kreibich.
From the author: In TCP/IP Illustrated Vol. 1, Richard Stevens used
a program called "sock" to demonstrate the many properties of TCP/IP.
Unfortunately, the book only speaks about how to use the program but
does not point to a site for downloading its sources. While sock is
contained in the code package accompanying UNIX Network Programming,
this code is also getting dated.
In TCP/IP Illustrated Vol. 1, Richard Stevens used a program called
"sock" to demonstrate the many properties of TCP/IP. This is a
standalone version, adapted and reworked by Christian Kreibich.
The program can be used to generate TCP or UDP packets for testing
various network features. It runs as either client or server.
WWW: http://www.icir.org/christian/sock.html
This FreeBSD port is built on top of the original 0.3.2 tarball from
2010, above, downloaded from the icir.org webpage.
Version 0.4.2 of sock supports IPv6, SCTP and those socket options:
- IPv6:
o hop limit
o multicast hop limit
o disable/enable header flow label
o header traffic class
o don't fragment
- IPv4:
o don't fragment
WWW: http://www-cs-students.stanford.edu/~sjac/sock_info.html

50
print/hplip/Makefile
View file

@ -39,44 +39,56 @@ CONFIGURE_ARGS= --with-cupsbackenddir=${PREFIX}/libexec/cups/backend \
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= DOCS FAX SNMP SCAN X11 XSANE
OPTIONS_DEFAULT= SNMP SCAN X11 QT5
OPTIONS_DEFINE= DOCS FAX SCAN SNMP X11 XSANE
OPTIONS_RADIO= GUI
OPTIONS_RADIO_GUI= QT4 QT5
OPTIONS_SUB= yes # FAX SNMP SCAN X11 QT4 QT5
OPTIONS_DEFAULT= QT5 SCAN SNMP X11
OPTIONS_SUB= yes
DOCS_CONFIGURE_ENABLE= doc-build
FAX_DESC= PC Send Fax support
FAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab
FAX_CONFIGURE_ENABLE= fax-build
SNMP_DESC= Network/JetDirect support
SNMP_USES= ssl
SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
SNMP_CONFIGURE_ENABLE= network-build
SCAN_DESC= Scanning support
SCAN_LIB_DEPENDS= libsane.so:graphics/sane-backends
SCAN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
SCAN_CONFIGURE_ENABLE= scan-build
SNMP_DESC= Network/JetDirect support
SNMP_USES= ssl
SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
SNMP_CONFIGURE_ENABLE= network-build
X11_DESC= Graphical User Interface (Qt)
X11_CONFIGURE_ENABLE= gui-build
QT4_USES= pyqt:4
QT4_USE= PYQT=core_run,dbussupport_run,gui_run
QT4_CONFIGURE_ENABLE= qt4
QT4_IMPLIES= X11
QT5_USES= pyqt:5
QT5_USE= PYQT=core_run,dbussupport_run,gui_run,widgets_run
QT5_CONFIGURE_ENABLE= qt5
QT5_IMPLIES= X11
XSANE_DESC= Install XSane for scanning (implies SCAN)
XSANE_IMPLIES= SCAN
XSANE_RUN_DEPENDS= xsane:graphics/xsane
DOCS_CONFIGURE_ENABLE= doc-build
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MQT4} && ${PORT_OPTIONS:MX11}
USES+= pyqt:4
USE_PYQT= core_run dbussupport_run gui_run
CONFIGURE_ARGS+= --enable-qt4
.else
CONFIGURE_ARGS+= --disable-qt4
.endif
.if ${PORT_OPTIONS:MQT5} && ${PORT_OPTIONS:MX11}
USES+= pyqt:5
USE_PYQT= core_run dbussupport_run gui_run widgets_run
CONFIGURE_ARGS+= --enable-qt5
.else
CONFIGURE_ARGS+= --disable-qt5
.endif
.if ${PORT_OPTIONS:MX11} && ! ${PORT_OPTIONS:MQT4} && ! ${PORT_OPTIONS:MQT5}
BROKEN= The X11 option requires one of the QT4 or QT5 options
.endif
post-patch:
@${REINPLACE_CMD} -e 's|-ldld||g;' \

5
sysutils/gnome-system-monitor/Makefile
View file

@ -17,11 +17,10 @@ RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme
PORTSCOUT= limitw:1,even
USES= alias gettext gmake pathfix pkgconfig tar:xz
USES= alias compiler:c++11-lang gettext gmake localbase pathfix pkgconfig tar:xz
USE_CXXSTD= c++11
USE_GNOME= gtkmm30 intlhack librsvg2 libwnck3
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.gnome-system-monitor.enums.xml \

5
sysutils/xorriso/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= xorriso
PORTVERSION= 1.4.6
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://files.libburnia-project.org/releases/
DISTNAME= libisoburn-${PORTVERSION}
@ -18,7 +18,8 @@ LIB_DEPENDS= libburn.so:devel/libburn \
libisofs.so:devel/libisofs
GNU_CONFIGURE= yes
USES= gmake iconv libtool libedit pathfix pkgconfig
USES= gmake iconv libtool libedit pathfix pkgconfig shebangfix tk
SHEBANG_FILES= frontend/xorriso-tcltk
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip

8
sysutils/xorriso/files/patch-frontend_xorriso-tcltk
View file

@ -1,8 +0,0 @@
--- frontend/xorriso-tcltk.orig 2017-04-02 07:56:18 UTC
+++ frontend/xorriso-tcltk
@@ -1,4 +1,4 @@
-#!/usr/bin/wish
+#!/usr/local/bin/wish
#
# xorriso-tcltk
# Copyright (C) 2012 - 2016

4
textproc/libsass/Makefile
View file

@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= libsass
PORTVERSION= 3.4.3
PORTREVISION= 1
PORTVERSION= 3.4.4
PORTREVISION= 0
CATEGORIES= textproc
MAINTAINER= nivit@FreeBSD.org

6
textproc/libsass/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1487432637
SHA256 (sass-libsass-3.4.3_GH0.tar.gz) = bbeda2e1ec2d21d27fbcbd8f2e18c3f4573cc168bb8b5cd5010715db4b3e5670
SIZE (sass-libsass-3.4.3_GH0.tar.gz) = 311505
TIMESTAMP = 1491134524
SHA256 (sass-libsass-3.4.4_GH0.tar.gz) = 1dc4d49a9a53b891b7e98935709e625f1d68782d87aef4304a41e6d590abb480
SIZE (sass-libsass-3.4.4_GH0.tar.gz) = 316884

Some files were not shown because too many files have changed in this diff Show more