Re: MODULES for misc/impress
Move it to Tcl/Tk 8.5 too; no problems noticed and the fonts are
much better. OK?
Index: Makefile
===
RCS file: /cvs/ports/misc/impress/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile19 Nov 2010 07:23:11 - 1.11
+++ Makefile1 Feb 2013 10:15:59 -
@@ -5,6 +5,7 @@ COMMENT=publishing and presentation too
VERSION= 1.1b9
DISTNAME= impress-${VERSION}
DISTFILES= imp${VERSION}.tar.gz
+REVISION= 0
CATEGORIES=misc
MASTER_SITES= ${HOMEPAGE}
@@ -18,8 +19,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-RUN_DEPENDS=x11/tk/8.4
+MODULES= x11/tk
+RUN_DEPENDS= ${MODTK_RUN_DEPENDS}
NO_REGRESS=Yes
+
+pre-configure:
+ @${MODTCL_WISH_ADJ} ${WRKSRC}/src/impress.tcl
.include
Index: distinfo
===
RCS file: /cvs/ports/misc/impress/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo5 Apr 2007 17:41:07 - 1.3
+++ distinfo1 Feb 2013 10:15:59 -
@@ -1,5 +1,2 @@
-MD5 (imp1.1b9.tar.gz) = RvCfJu0Db17EkWkzkChd7A==
-RMD160 (imp1.1b9.tar.gz) = Lw1J2QuqHJLt9WS/FjFHZ5xMuvQ=
-SHA1 (imp1.1b9.tar.gz) = c9POadLTGvC45r+zgl680vUZAkw=
SHA256 (imp1.1b9.tar.gz) = PnOoaPDPXrPSHRKkChQPI0XNmdV1yNxyWVR+lbmRrbE=
SIZE (imp1.1b9.tar.gz) = 1334533
Index: patches/patch-src_impress_tcl
===
RCS file: patches/patch-src_impress_tcl
diff -N patches/patch-src_impress_tcl
--- patches/patch-src_impress_tcl 27 Dec 2003 23:37:02 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
src/impress.tcl.orig Fri Jun 29 10:21:58 2001
-+++ src/impress.tclFri Jun 29 10:22:10 2001
-@@ -19,7 +19,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
- # restart trick \
--exec wish "$0" "$@"
-+exec wish8.4 "$0" "$@"
-
- option add *Radiobutton*borderWidth 1
- option add *Button*borderWidth 1
Re: MODULES for devel/p5-Devel-ptkdb
This one actually just depends on p5-Tk so no point using the run dep;
also drop USE_GROFF and remove pointless PKGNAME setting while there
(cpan module does this for you).
Index: Makefile
===
RCS file: /cvs/ports/devel/p5-Devel-ptkdb/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile15 Oct 2012 15:18:32 - 1.10
+++ Makefile1 Feb 2013 10:29:38 -
@@ -2,11 +2,9 @@
COMMENT= perl debugger built with a PerlTk GUI
-MODULES= cpan
DISTNAME= Devel-ptkdb-1.1092
-PKGNAME= p5-${DISTNAME}
-REVISION= 0
-CATEGORIES=devel
+REVISION= 1
+CATEGORIES=devel
HOMEPAGE= http://sourceforge.net/projects/ptkdb/
@@ -18,11 +16,11 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ptkdb/}
+MODULES= cpan
+
CONFIGURE_ARGS=INSTALLDIRS="site"
-USE_GROFF =Yes
-BUILD_DEPENDS= x11/p5-Tk
-RUN_DEPENDS= x11/tk/8.4 \
- x11/p5-Tk
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= x11/p5-Tk
.include
On 2013/02/01 00:27, Stuart Cassoff wrote:
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/p5-Devel-ptkdb/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile 15 Oct 2012 15:18:32 - 1.10
> +++ Makefile 29 Jan 2013 14:11:35 -
> @@ -2,7 +2,6 @@
>
> COMMENT= perl debugger built with a PerlTk GUI
>
> -MODULES= cpan
> DISTNAME=Devel-ptkdb-1.1092
> PKGNAME= p5-${DISTNAME}
> REVISION=0
> @@ -18,11 +17,14 @@ PERMIT_DISTFILES_FTP= Yes
>
> MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=ptkdb/}
>
> +MODULES= cpan x11/tk
> +MODTK_VERSION= 8.4
> +
> CONFIGURE_ARGS= INSTALLDIRS="site"
> USE_GROFF = Yes
>
> BUILD_DEPENDS= x11/p5-Tk
> -RUN_DEPENDS= x11/tk/8.4 \
> +RUN_DEPENDS= ${MODTK_RUN_DEPENDS} \
> x11/p5-Tk
>
> .include
>
Re: MODULES for misc/impress
On 02/01/13 05:16, Stuart Henderson wrote: > Move it to Tcl/Tk 8.5 too; no problems noticed and the fonts are > much better. OK? Great, thanks! I'll commit this today. Stu
Re: MODULES for devel/p5-Devel-ptkdb
On 02/01/13 05:30, Stuart Henderson wrote: > This one actually just depends on p5-Tk so no point using the run dep; > also drop USE_GROFF and remove pointless PKGNAME setting while there > (cpan module does this for you). > Brilliant! I was just after moving everything to modules. Thanks for the nice extra work. Committing today. Stu
www/webkit amd64 build failures on -current
the build causes the machine to crawl. dpb invoked exactly like "dpb x11/e17". the build is terminated due to a SIGINT. is this due to a PEBKAC? here's the /usr/ports/logs/packages/webkit-gtk3-1.8.3p4v0.log c++ -DHAVE_CONFIG_H -I. -DBUILDING_WEBKIT -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type -Wformat -Wformat-security -Wno-format-y2k -Wundef -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-unused-parameter -Wno-parentheses -fno-exceptions -DENABLE_GLIB_SUPPORT=1 -DBUILDING_CAIRO__=1 -DBUILDING_GTK__=1 -DWTF_CHANGES -DXP_UNIX -DWTF_USE_ICU_UNICODE=1 -DWTF _USE_GSTREAMER=1 -DNDEBUG -I./Source/ThirdParty/ANGLE/src -I./Source/ThirdParty/ANGLE/include -I./Source/ThirdParty/ANGLE/include/GLSLANG -I./Source/WebCore -I./Source/WebCore/accessibility -I./Source/WebCore/bindings -I./Source/WebCore/bindings/generic -I./Source/WebCore/bindings/js -I./Source/WebCore/bindings/js/specialization -I./Source/WebCore/bridge -I./Source/WebCore/br idge/c -I./Source/WebCore/bridge/jni/jsc -I./Source/WebCore/bridge/jsc -I./Source/WebCore/css -I./Source/WebCore/dom -I./Source/WebCore/dom/default -I./Source/WebCore/editing -I./Source/Web Core/fileapi -I./Source/WebCore/history -I./Source/WebCore/html -I./Source/WebCore/html/canvas -I./Source/WebCore/html/parser -I./Source/WebCore/html/shadow -I./Source/WebCore/html/track -I ./Source/WebCore/inspector -I./Source/WebCore/loader -I./Source/WebCore/loader/appcache -I./Source/WebCore/loader/archive -I./Source/WebCore/loader/cache -I./Source/WebCore/loader/icon -I./ Source/WebCore/mathml -I./Source/WebCore/mediastream -I./Source/WebCore/notifications -I./Source/WebCore/page -I./Source/WebCore/page/animation -I./Source/WebCore/page/scrolling -I./Source/ WebCore/platform -I./Source/WebCore/platform/animation -I./Source/WebCore/platform/audio -I./Source/WebCore/platform/graphics -I./Source/WebCore/platform/graphics/filters -I./Source/WebCore /platform/graphics/filters/arm -I./Source/WebCore/platform/graphics/gpu -I./Source/WebCore/platform/graphics/opengl -I./Source/WebCore/platform/graphics/opentype -I./Source/WebCore/platform /graphics/transforms -I./Source/WebCore/platform/image-decoders -I./Source/WebCore/platform/image-decoders/bmp -I./Source/WebCore/platform/image-decoders/gif -I./Source/WebCore/platform/ima ge-decoders/ico -I./Source/WebCore/platform/image-decoders/jpeg -I./Source/WebCore/platform/image-decoders/webp -I./Source/WebCore/platform/image-decoders/png -I./Source/WebCore/platform/le veldb -I./Source/WebCore/platform/mediastream -I./Source/WebCore/platform/mock -I./Source/WebCore/platform/network -I./Source/WebCore/platform/sql -I./Source/WebCore/platform/text -I./Sourc e/WebCore/platform/text/transcoder -I./Source/WebCore/platform/win -I./Source/WebCore/plugins -I./Source/WebCore/plugins/win -I./Source/WebCore/rendering -I./Source/WebCore/rendering/mathml -I./Source/WebCore/rendering/style -I./Source/WebCore/rendering/svg -I./Source/WebCore/storage -I./Source/WebCore/svg -I./Source/WebCore/svg/animation -I./Source/WebCore/svg/graphics -I./S ource/WebCore/svg/graphics/filters -I./Source/WebCore/svg/properties -I./Source/WebCore/testing -I./Source/WebCore/testing/js -I./Source/WebCore/webaudio -I./Source/WebCore/websockets -I./S ource/WebCore/workers -I./Source/WebCore/xml -I./Source/WebCore/xml/parser -I./WebCore/bindings/js -I./DerivedSources/WebCore -I./DerivedSources -I./DerivedSources/JavaScriptCore -DDATA_DIR ="/usr/local/share" -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_METER_TAG=1 -DENABLE_PROGRESS_TAG=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_GAMEPAD=0 -DENABLE_SQL_DATABASE=1 -DENABLE_DATALIST=1 - DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_INPUT_COLOR=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_ICONDATABASE=1 -DENABLE_VIDEO=1 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATI STICS=0 -DENABLE_FULLSCREEN_API=1 -DENABLE_VIDEO_TRACK=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_XSLT=1 -DENABLE_WORKERS=1 -DENABLE_SHADOW_DOM=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_FILTERS=1 -DENAB LE_GEOLOCATION=1 -DENABLE_CLIENT_BASED_GEOLOCATION=1 -DENABLE_MATHML=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_BLOB=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE _WEBGL=1 -DWEBKITGTK_API_VERSION_STRING="3.0" -DWTF_USE_SOUP=1 -I./Source/WebCore/accessibility/gtk -I./Source/WebCore/loader/gtk -I./Source/WebCore/page/gtk -I./Source/WebCore/platform/cai ro -I./Source/WebCore/platform/audio/gstreamer -I./Source/WebCore/platform/graphics/cairo -I./Source/WebCore/platform/graphics/glx -I./Source/WebCore/platform/graphics/gstreamer -I./Source/ WebCore/platform/graphics/gtk -I./Source/WebCore/platform/gtk -I./Source/WebCore/platform/network/soup -DWTF_USE_FREETYPE=1 -I./Source/WebCore/platform/graphics/freetype -I./Source -I./Sour ce/JavaScriptCore -I./Source/JavaScriptCore/API -I./Source/JavaScriptCore/assembler -I./Source/JavaScriptCore/bytecode -I./Source/JavaScriptCore/bytecompiler -I./Source/JavaScriptCore/dfg - I./Source/JavaScriptCore/heap -I./Source
Re: www/webkit amd64 build failures on -current
Your limits are a bit low. I would at least double staff's maxproc/openfiles for 4-core dpb, and probably usr at least 2.5GB datasize. No idea if you use malloc.conf options but if so, gmake bugs are likely to hit you. Amit Kulkarni wrote: >the build causes the machine to crawl. dpb invoked exactly like "dpb >x11/e17". the build is terminated due to a SIGINT. >is this due to a PEBKAC? > >here's the /usr/ports/logs/packages/webkit-gtk3-1.8.3p4v0.log > >c++ -DHAVE_CONFIG_H -I. -DBUILDING_WEBKIT -Wall -W -Wcast-align >-Wchar-subscripts -Wreturn-type -Wformat -Wformat-security >-Wno-format-y2k >-Wundef -Wmissing-format-attribute -Wpointer-arith > -Wwrite-strings -Wno-unused-parameter -Wno-parentheses -fno-exceptions >-DENABLE_GLIB_SUPPORT=1 -DBUILDING_CAIRO__=1 -DBUILDING_GTK__=1 >-DWTF_CHANGES -DXP_UNIX -DWTF_USE_ICU_UNICODE=1 -DWTF >_USE_GSTREAMER=1 -DNDEBUG -I./Source/ThirdParty/ANGLE/src >-I./Source/ThirdParty/ANGLE/include >-I./Source/ThirdParty/ANGLE/include/GLSLANG -I./Source/WebCore >-I./Source/WebCore/accessibility > -I./Source/WebCore/bindings -I./Source/WebCore/bindings/generic >-I./Source/WebCore/bindings/js >-I./Source/WebCore/bindings/js/specialization -I./Source/WebCore/bridge >-I./Source/WebCore/br >idge/c -I./Source/WebCore/bridge/jni/jsc -I./Source/WebCore/bridge/jsc >-I./Source/WebCore/css -I./Source/WebCore/dom >-I./Source/WebCore/dom/default -I./Source/WebCore/editing >-I./Source/Web >Core/fileapi -I./Source/WebCore/history -I./Source/WebCore/html >-I./Source/WebCore/html/canvas -I./Source/WebCore/html/parser >-I./Source/WebCore/html/shadow -I./Source/WebCore/html/track -I >./Source/WebCore/inspector -I./Source/WebCore/loader >-I./Source/WebCore/loader/appcache -I./Source/WebCore/loader/archive >-I./Source/WebCore/loader/cache -I./Source/WebCore/loader/icon -I./ >Source/WebCore/mathml -I./Source/WebCore/mediastream >-I./Source/WebCore/notifications -I./Source/WebCore/page >-I./Source/WebCore/page/animation -I./Source/WebCore/page/scrolling >-I./Source/ >WebCore/platform -I./Source/WebCore/platform/animation >-I./Source/WebCore/platform/audio -I./Source/WebCore/platform/graphics >-I./Source/WebCore/platform/graphics/filters -I./Source/WebCore >/platform/graphics/filters/arm -I./Source/WebCore/platform/graphics/gpu >-I./Source/WebCore/platform/graphics/opengl >-I./Source/WebCore/platform/graphics/opentype >-I./Source/WebCore/platform >/graphics/transforms -I./Source/WebCore/platform/image-decoders >-I./Source/WebCore/platform/image-decoders/bmp >-I./Source/WebCore/platform/image-decoders/gif >-I./Source/WebCore/platform/ima >ge-decoders/ico -I./Source/WebCore/platform/image-decoders/jpeg >-I./Source/WebCore/platform/image-decoders/webp >-I./Source/WebCore/platform/image-decoders/png >-I./Source/WebCore/platform/le >veldb -I./Source/WebCore/platform/mediastream >-I./Source/WebCore/platform/mock -I./Source/WebCore/platform/network >-I./Source/WebCore/platform/sql -I./Source/WebCore/platform/text >-I./Sourc >e/WebCore/platform/text/transcoder -I./Source/WebCore/platform/win >-I./Source/WebCore/plugins -I./Source/WebCore/plugins/win >-I./Source/WebCore/rendering -I./Source/WebCore/rendering/mathml > -I./Source/WebCore/rendering/style -I./Source/WebCore/rendering/svg >-I./Source/WebCore/storage -I./Source/WebCore/svg >-I./Source/WebCore/svg/animation -I./Source/WebCore/svg/graphics -I./S >ource/WebCore/svg/graphics/filters -I./Source/WebCore/svg/properties >-I./Source/WebCore/testing -I./Source/WebCore/testing/js >-I./Source/WebCore/webaudio -I./Source/WebCore/websockets -I./S >ource/WebCore/workers -I./Source/WebCore/xml >-I./Source/WebCore/xml/parser >-I./WebCore/bindings/js -I./DerivedSources/WebCore -I./DerivedSources >-I./DerivedSources/JavaScriptCore -DDATA_DIR >="/usr/local/share" -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_METER_TAG=1 >-DENABLE_PROGRESS_TAG=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 >-DENABLE_GAMEPAD=0 >-DENABLE_SQL_DATABASE=1 -DENABLE_DATALIST=1 - >DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_TOUCH_ICON_LOADING=0 >-DENABLE_INPUT_COLOR=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_ICONDATABASE=1 >-DENABLE_VIDEO=1 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATI >STICS=0 -DENABLE_FULLSCREEN_API=1 -DENABLE_VIDEO_TRACK=0 >-DENABLE_MEDIA_STREAM=0 -DENABLE_XSLT=1 -DENABLE_WORKERS=1 >-DENABLE_SHADOW_DOM=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_FILTERS=1 >-DENAB >LE_GEOLOCATION=1 -DENABLE_CLIENT_BASED_GEOLOCATION=1 -DENABLE_MATHML=1 >-DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_WEB_SOCKETS=1 >-DENABLE_BLOB=1 >-DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE >_WEBGL=1 -DWEBKITGTK_API_VERSION_STRING="3.0" -DWTF_USE_SOUP=1 >-I./Source/WebCore/accessibility/gtk -I./Source/WebCore/loader/gtk >-I./Source/WebCore/page/gtk -I./Source/WebCore/platform/cai >ro -I./Source/WebCore/platform/audio/gstreamer >-I./Source/WebCore/platform/graphics/cairo >-I./Source/WebCore/platform/graphics/glx >-I./Source/WebCore/platform/graphics/gstreamer -I./Source/ >WebCore/platform/graphics/gtk -I./Source/WebCore/platform/gtk >-I./Source/WebCore/pla
Re: www/webkit amd64 build failures on -current
On Fri, Feb 1, 2013 at 9:24 AM, Stuart Henderson wrote: > Your limits are a bit low. I would at least double staff's > maxproc/openfiles for 4-core dpb, and probably usr at least 2.5GB datasize. > No idea if you use malloc.conf options but if so, gmake bugs are likely to > hit you. > gmake is using 360M - 400M and even causing problems in a single core build. problem is gmake then. i am not fiddling with malloc.conf options on this machien. thanks for the hints > > Amit Kulkarni wrote: > > >the build causes the machine to crawl. dpb invoked exactly like "dpb > >x11/e17". the build is terminated due to a SIGINT. > >is this due to a PEBKAC? > > > >here's the /usr/ports/logs/packages/webkit-gtk3-1.8.3p4v0.log > > > >c++ -DHAVE_CONFIG_H -I. -DBUILDING_WEBKIT -Wall -W -Wcast-align > >-Wchar-subscripts -Wreturn-type -Wformat -Wformat-security > >-Wno-format-y2k > >-Wundef -Wmissing-format-attribute -Wpointer-arith > > -Wwrite-strings -Wno-unused-parameter -Wno-parentheses -fno-exceptions > >-DENABLE_GLIB_SUPPORT=1 -DBUILDING_CAIRO__=1 -DBUILDING_GTK__=1 > >-DWTF_CHANGES -DXP_UNIX -DWTF_USE_ICU_UNICODE=1 -DWTF > >_USE_GSTREAMER=1 -DNDEBUG -I./Source/ThirdParty/ANGLE/src > >-I./Source/ThirdParty/ANGLE/include > >-I./Source/ThirdParty/ANGLE/include/GLSLANG -I./Source/WebCore > >-I./Source/WebCore/accessibility > > -I./Source/WebCore/bindings -I./Source/WebCore/bindings/generic > >-I./Source/WebCore/bindings/js > >-I./Source/WebCore/bindings/js/specialization -I./Source/WebCore/bridge > >-I./Source/WebCore/br > >idge/c -I./Source/WebCore/bridge/jni/jsc -I./Source/WebCore/bridge/jsc > >-I./Source/WebCore/css -I./Source/WebCore/dom > >-I./Source/WebCore/dom/default -I./Source/WebCore/editing > >-I./Source/Web > >Core/fileapi -I./Source/WebCore/history -I./Source/WebCore/html > >-I./Source/WebCore/html/canvas -I./Source/WebCore/html/parser > >-I./Source/WebCore/html/shadow -I./Source/WebCore/html/track -I > >./Source/WebCore/inspector -I./Source/WebCore/loader > >-I./Source/WebCore/loader/appcache -I./Source/WebCore/loader/archive > >-I./Source/WebCore/loader/cache -I./Source/WebCore/loader/icon -I./ > >Source/WebCore/mathml -I./Source/WebCore/mediastream > >-I./Source/WebCore/notifications -I./Source/WebCore/page > >-I./Source/WebCore/page/animation -I./Source/WebCore/page/scrolling > >-I./Source/ > >WebCore/platform -I./Source/WebCore/platform/animation > >-I./Source/WebCore/platform/audio -I./Source/WebCore/platform/graphics > >-I./Source/WebCore/platform/graphics/filters -I./Source/WebCore > >/platform/graphics/filters/arm -I./Source/WebCore/platform/graphics/gpu > >-I./Source/WebCore/platform/graphics/opengl > >-I./Source/WebCore/platform/graphics/opentype > >-I./Source/WebCore/platform > >/graphics/transforms -I./Source/WebCore/platform/image-decoders > >-I./Source/WebCore/platform/image-decoders/bmp > >-I./Source/WebCore/platform/image-decoders/gif > >-I./Source/WebCore/platform/ima > >ge-decoders/ico -I./Source/WebCore/platform/image-decoders/jpeg > >-I./Source/WebCore/platform/image-decoders/webp > >-I./Source/WebCore/platform/image-decoders/png > >-I./Source/WebCore/platform/le > >veldb -I./Source/WebCore/platform/mediastream > >-I./Source/WebCore/platform/mock -I./Source/WebCore/platform/network > >-I./Source/WebCore/platform/sql -I./Source/WebCore/platform/text > >-I./Sourc > >e/WebCore/platform/text/transcoder -I./Source/WebCore/platform/win > >-I./Source/WebCore/plugins -I./Source/WebCore/plugins/win > >-I./Source/WebCore/rendering -I./Source/WebCore/rendering/mathml > > -I./Source/WebCore/rendering/style -I./Source/WebCore/rendering/svg > >-I./Source/WebCore/storage -I./Source/WebCore/svg > >-I./Source/WebCore/svg/animation -I./Source/WebCore/svg/graphics -I./S > >ource/WebCore/svg/graphics/filters -I./Source/WebCore/svg/properties > >-I./Source/WebCore/testing -I./Source/WebCore/testing/js > >-I./Source/WebCore/webaudio -I./Source/WebCore/websockets -I./S > >ource/WebCore/workers -I./Source/WebCore/xml > >-I./Source/WebCore/xml/parser > >-I./WebCore/bindings/js -I./DerivedSources/WebCore -I./DerivedSources > >-I./DerivedSources/JavaScriptCore -DDATA_DIR > >="/usr/local/share" -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_METER_TAG=1 > >-DENABLE_PROGRESS_TAG=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 > >-DENABLE_GAMEPAD=0 > >-DENABLE_SQL_DATABASE=1 -DENABLE_DATALIST=1 - > >DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_TOUCH_ICON_LOADING=0 > >-DENABLE_INPUT_COLOR=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_ICONDATABASE=1 > >-DENABLE_VIDEO=1 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATI > >STICS=0 -DENABLE_FULLSCREEN_API=1 -DENABLE_VIDEO_TRACK=0 > >-DENABLE_MEDIA_STREAM=0 -DENABLE_XSLT=1 -DENABLE_WORKERS=1 > >-DENABLE_SHADOW_DOM=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_FILTERS=1 > >-DENAB > >LE_GEOLOCATION=1 -DENABLE_CLIENT_BASED_GEOLOCATION=1 -DENABLE_MATHML=1 > >-DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_WEB_SOCKETS=1 > >-DENABLE_BLOB=1 > >-DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE > >_WEBGL=1 -DWEBKITGTK_API_VERSION_STRING="3.0" -DWTF_
UPDATE: graphics/cairo
Hi,
This is an update to cairo 1.12.12.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile30 Jan 2013 13:17:51 - 1.45
+++ Makefile1 Feb 2013 17:44:05 -
@@ -2,9 +2,8 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.12.8
-REVISION= 1
-SHARED_LIBS+= cairo 12.1
+DISTNAME= cairo-1.12.12
+SHARED_LIBS+= cairo 12.2
SHARED_LIBS+= cairo-gobject 1.0
SHARED_LIBS+= cairo-script-interpreter 1.0
CATEGORIES=graphics
Index: distinfo
===
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo12 Nov 2012 12:29:07 - 1.20
+++ distinfo1 Feb 2013 17:44:05 -
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.12.8.tar.xz) = j7tvxmEXq0EAutgwy0R5SX5TxvP6y5i/BcjSmFVOvdk=
-SIZE (cairo-1.12.8.tar.xz) = 42113752
+SHA256 (cairo-1.12.12.tar.xz) = FPaTdZ7Mh0cjVa6PDDRzGoV4tAi2B8/QtdNDMf8F2Bo=
+SIZE (cairo-1.12.12.tar.xz) = 42139096
Index: patches/patch-src_cairo_pc_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-src_cairo_pc_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_cairo_pc_in
--- patches/patch-src_cairo_pc_in 30 Jan 2013 13:17:51 - 1.1
+++ patches/patch-src_cairo_pc_in 1 Feb 2013 17:44:05 -
@@ -1,11 +1,11 @@
$OpenBSD: patch-src_cairo_pc_in,v 1.1 2013/01/30 13:17:51 brad Exp $
src/cairo.pc.in.orig Tue Jan 29 07:56:53 2013
-+++ src/cairo.pc.inTue Jan 29 08:22:13 2013
+--- src/cairo.pc.in.orig Sun Dec 6 09:29:25 2009
src/cairo.pc.inFri Feb 1 17:25:52 2013
@@ -8,6 +8,6 @@ Description: Multi-platform 2D graphics library
Version: @VERSION@
@PKGCONFIG_REQUIRES@: @CAIRO_REQUIRES@
-Libs: -L${libdir} -lcairo
-+Libs: -L${libdir} -Wl,-rpath-link,${X11BASE}/lib -lcairo
++Libs: -L${libdir} -Wl,-rpath-link,/usr/X11R6/lib -lcairo
Libs.private: @CAIRO_NONPKGCONFIG_LIBS@
Cflags: -I${includedir}/cairo
Index: patches/patch-util_cairo-fdr_Makefile_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-fdr_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-util_cairo-fdr_Makefile_in
--- patches/patch-util_cairo-fdr_Makefile_in12 Nov 2012 12:29:07 -
1.2
+++ patches/patch-util_cairo-fdr_Makefile_in1 Feb 2013 17:44:05 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-fdr_Makefile_in,v 1.2 2012/11/12 12:29:07 eric Exp $
util/cairo-fdr/Makefile.in.origMon Oct 22 06:08:40 2012
-+++ util/cairo-fdr/Makefile.in Wed Oct 24 03:52:52 2012
-@@ -379,7 +379,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
+--- util/cairo-fdr/Makefile.in.origThu Jan 31 16:25:59 2013
util/cairo-fdr/Makefile.in Fri Feb 1 17:25:52 2013
+@@ -380,7 +380,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
cairo_fdr_la_SOURCES = fdr.c
cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)
Index: patches/patch-util_cairo-trace_Makefile_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-trace_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-util_cairo-trace_Makefile_in
--- patches/patch-util_cairo-trace_Makefile_in 16 Jan 2013 14:29:15 -
1.4
+++ patches/patch-util_cairo-trace_Makefile_in 1 Feb 2013 17:44:05 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-trace_Makefile_in,v 1.4 2013/01/16 14:29:15
ajacoutot Exp $
util/cairo-trace/Makefile.in.orig Mon Oct 22 06:08:41 2012
-+++ util/cairo-trace/Makefile.in Wed Oct 24 03:51:46 2012
-@@ -399,7 +399,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$
+--- util/cairo-trace/Makefile.in.orig Thu Jan 31 16:26:00 2013
util/cairo-trace/Makefile.in Fri Feb 1 17:25:52 2013
+@@ -400,7 +400,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$
$(AM_CPPFLAGS)
libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)
Re: ettercap not working
On Tue, Jan 22, 2013 at 07:45:22PM +0100, Matthias Kilian wrote:
> This is better for now (smaller diff, probably easier to convince
> upstream about this). The other glitches (missing return code checks,
> useless use of macros etc.) should be done separately with upstream.
Same, with an update to ettercap-0.7.5.3 (includes a fix for
CVE-2013-0722). Of course it needs yet another dirty hack to let
it compile, because upstream appears to abuse some macros found in
arpa/nameser.h on some systems.
Please note that I do not use ettercap, so if anyone wants it to
be fixed, please test.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/net/ettercap/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile10 Jan 2013 18:11:14 - 1.57
+++ Makefile1 Feb 2013 19:45:37 -
@@ -1,13 +1,10 @@
# $OpenBSD: Makefile,v 1.57 2013/01/10 18:11:14 sthen Exp $
-BROKEN=broken mutex locking
-# see http://marc.info/?l=openbsd-ports&m=135577437106908&w=2
-
SHARED_ONLY= Yes
COMMENT= multi-purpose sniffer/interceptor/logger
-DISTNAME= ettercap-0.7.5.1
+DISTNAME= ettercap-0.7.5.3
CATEGORIES=net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ettercap/}
@@ -31,6 +28,14 @@ LIB_DEPENDS= net/libnet/1.1 \
FLAVORS= no_x11
FLAVOR?=
+
+# Crude hack to let src/ec_inet.c compile. Those two symbols where
+# defined in an enum in include/ec_inet.h before ettercap-0.7.5.2.
+# They are currently also defined in include/missing/nameser.h, but this
+# can't be used because it introduces other errors, and, more
+# importantly, because using those NS_* macros in src/ec_inet.c is just
+# wrong.
+CFLAGS+= -DNS_IN6ADDRSZ=16 -DNS_INT16SZ=2
CONFIGURE_ARGS+= -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-DMAN_INSTALLDIR="${TRUEPREFIX}/man"
Index: distinfo
===
RCS file: /cvs/ports/net/ettercap/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo10 Jan 2013 18:11:14 - 1.14
+++ distinfo1 Feb 2013 19:45:37 -
@@ -1,2 +1,2 @@
-SHA256 (ettercap-0.7.5.1.tar.gz) = cxPrAwlZmK/L29TZgbCaGjLSR+x4y1M6+/U1eaocovE=
-SIZE (ettercap-0.7.5.1.tar.gz) = 721872
+SHA256 (ettercap-0.7.5.3.tar.gz) = bstbYnQeSYYhXrVffr5Zb5ujd/xoFysQ0l1O886ENiM=
+SIZE (ettercap-0.7.5.3.tar.gz) = 722784
Index: patches/patch-src_ec_threads_c
===
RCS file: patches/patch-src_ec_threads_c
diff -N patches/patch-src_ec_threads_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_ec_threads_c 1 Feb 2013 19:45:37 -
@@ -0,0 +1,81 @@
+$OpenBSD$
+
+Use proper synchronization instead of unportable and dubious default
+behaviour of mutexes on certain operating systems. While here,
+correct the error message when pthread_create(3) fails.
+
+--- src/ec_threads.c.orig Thu Jan 3 05:56:19 2013
src/ec_threads.c Tue Jan 22 19:03:52 2013
+@@ -42,6 +42,7 @@ static pthread_mutex_t threads_mutex = PTHREAD_MUTEX_I
+ #define THREADS_UNLOCK do{ pthread_mutex_unlock(&threads_mutex); } while(0)
+
+ static pthread_mutex_t init_mtx = PTHREAD_MUTEX_INITIALIZER;
++static pthread_cond_t init_cond = PTHREAD_COND_INITIALIZER;
+ #define INIT_LOCK do{ DEBUG_MSG("thread_init_lock");
pthread_mutex_lock(&init_mtx); } while(0)
+ #define INIT_UNLOCK do{ DEBUG_MSG("thread_init_unlock");
pthread_mutex_unlock(&init_mtx); } while(0)
+
+@@ -196,35 +197,35 @@ pthread_t ec_thread_new(char *name, char *desc, void *
+ pthread_t ec_thread_new_detached(char *name, char *desc, void
*(*function)(void *), void *args, int detached)
+ {
+pthread_t id;
++ int e;
+
+DEBUG_MSG("ec_thread_new -- %s detached %d", name, detached);
+
+/*
+ * lock the mutex to syncronize with the new thread.
+-* the newly created thread will perform INIT_UNLOCK
++* the newly created thread will call ec_thread_init(),
+ * so at the end of this function we are sure that the
+ * thread had be initialized
+ */
+INIT_LOCK;
+
+-
+if (detached == DETACHED_THREAD) {
+ pthread_attr_t attr;
+ pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+- if (pthread_create(&id, &attr, function, args) != 0)
+- ERROR_MSG("not enough resources to create a new thread in this
process: %s", strerror(errno));
++ if ((e = pthread_create(&id, &attr, function, args) != 0))
++ ERROR_MSG("not enough resources to create a new thread in this
process: %s", strerror(e));
+}else {
+- if (pthread_create(&id, NULL, function, args) != 0)
+- ERROR_MSG("not enough resources to create a new thread in this
process: %s", strerror(errno));
++ if ((e = pthread_create(&id, NULL, function, args) != 0))
++ ERROR_MSG("not enough resources to create a new t
Re: UPDATE: graphics/cairo
On Fri, Feb 01, 2013 at 07:27:22PM +0100, Eric Faurot wrote:
> Hi,
>
> This is an update to cairo 1.12.12.
>
> diff -u -p -r1.1 patch-src_cairo_pc_in
> --- patches/patch-src_cairo_pc_in 30 Jan 2013 13:17:51 - 1.1
> +++ patches/patch-src_cairo_pc_in 1 Feb 2013 17:44:05 -
> @@ -1,11 +1,11 @@
> $OpenBSD: patch-src_cairo_pc_in,v 1.1 2013/01/30 13:17:51 brad Exp $
> src/cairo.pc.in.orig Tue Jan 29 07:56:53 2013
> -+++ src/cairo.pc.in Tue Jan 29 08:22:13 2013
> +--- src/cairo.pc.in.orig Sun Dec 6 09:29:25 2009
> src/cairo.pc.in Fri Feb 1 17:25:52 2013
> @@ -8,6 +8,6 @@ Description: Multi-platform 2D graphics library
> Version: @VERSION@
>
> @PKGCONFIG_REQUIRES@: @CAIRO_REQUIRES@
> -Libs: -L${libdir} -lcairo
> -+Libs: -L${libdir} -Wl,-rpath-link,${X11BASE}/lib -lcairo
> ++Libs: -L${libdir} -Wl,-rpath-link,/usr/X11R6/lib -lcairo
> Libs.private: @CAIRO_NONPKGCONFIG_LIBS@
> Cflags: -I${includedir}/cairo
This looks wrong. X11BASE may not be defined when someone parses
cairo.pc, but hard-coding the /usr/X11R6 value seems to ack that the
value of X11BASE will never change
Something like @X11BASE@ with the proper substitution at configure time is
probably better.
But dozeen of other packages may be affected by the same kind of
issues, and I'm too lazy now to check what's the approved approach for
other cases.
Anyways if this change is wanted, it should probably be a separate commit.
--
Matthieu Herrb
Re: UPDATE: graphics/cairo
On 2013/02/02 01:28, Matthieu Herrb wrote:
> This looks wrong. X11BASE may not be defined when someone parses
> cairo.pc, but hard-coding the /usr/X11R6 value seems to ack that the
> value of X11BASE will never change
${X11BASE} here is fine, it is handled by ${SUBST_CMD} in the pre-configure
target.
UPDATE: hs-postgresql-libpq
Hi, update hs-postgresql-libpq to 0.8.2.2 and bump hs-postgresql-simple. Tested on amd64. As a heavy user of both packages, I'd like to take over maintainership as well. Index: hs-postgresql-libpq/Makefile === RCS file: /cvs/ports/databases/hs-postgresql-libpq/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- hs-postgresql-libpq/Makefile20 Jan 2013 17:58:07 - 1.2 +++ hs-postgresql-libpq/Makefile2 Feb 2013 02:43:47 - @@ -2,11 +2,12 @@ COMMENT = low-level binding to libpq -DISTNAME = postgresql-libpq-0.8.2.1 -REVISION = 0 +DISTNAME = postgresql-libpq-0.8.2.2 CATEGORIES = databases HOMEPAGE = https://github.com/lpsmith/postgresql-libpq + +MAINTAINER = David Schaefer # BSD3 PERMIT_PACKAGE_CDROM = Yes Index: hs-postgresql-libpq/distinfo === RCS file: /cvs/ports/databases/hs-postgresql-libpq/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- hs-postgresql-libpq/distinfo11 Jan 2013 20:19:49 - 1.1.1.1 +++ hs-postgresql-libpq/distinfo2 Feb 2013 02:43:47 - @@ -1,2 +1,2 @@ -SHA256 (ghc/postgresql-libpq-0.8.2.1.tar.gz) = jez3OPTbuxlA61US2NSIFikJhy6aYPrYHI8m9kIhXjo= -SIZE (ghc/postgresql-libpq-0.8.2.1.tar.gz) = 27341 +SHA256 (ghc/postgresql-libpq-0.8.2.2.tar.gz) = 6KByzQZFs6kCOblA8S4XXQMTFowQdYkoGReFoeJzutY= +SIZE (ghc/postgresql-libpq-0.8.2.2.tar.gz) = 27563 Index: hs-postgresql-simple/Makefile === RCS file: /cvs/ports/databases/hs-postgresql-simple/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- hs-postgresql-simple/Makefile 20 Jan 2013 17:58:07 - 1.2 +++ hs-postgresql-simple/Makefile 2 Feb 2013 02:43:48 - @@ -3,10 +3,12 @@ COMMENT = mid-level PostgreSQL client library DISTNAME = postgresql-simple-0.2.4.1 -REVISION = 0 +REVISION = 1 CATEGORIES = databases HOMEPAGE = https://github.com/lpsmith/postgresql-simple + +MAINTAINER = David Schaefer # BSD3 PERMIT_PACKAGE_CDROM = Yes
