Index: head/x11/kdelibs3/Makefile =================================================================== --- head/x11/kdelibs3/Makefile (revision 186671) +++ head/x11/kdelibs3/Makefile (revision 186672) @@ -1,112 +1,112 @@ # -*-mode: makefile-*- # New ports collection makefile for: KDE libraries 3 # Date created: 2 November 2001 # Whom: will@cvs.kde.org # # $FreeBSD$ # PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src PKGNAMESUFFIX?= # empty DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Base set of libraries needed by KDE programs BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ artsc.0:${PORTSDIR}/audio/arts \ aspell:${PORTSDIR}/textproc/aspell \ dns_sd:${PORTSDIR}/net/mDNSResponder \ idn:${PORTSDIR}/dns/libidn \ jasper:${PORTSDIR}/graphics/jasper \ pcre:${PORTSDIR}/devel/pcre \ thai:${PORTSDIR}/devel/libthai \ tiff.4:${PORTSDIR}/graphics/tiff \ xml2.5:${PORTSDIR}/textproc/libxml2 \ xslt.2:${PORTSDIR}/textproc/libxslt RUN_DEPENDS= kdehier>0:${PORTSDIR}/misc/kdehier \ iceauth:${X_CLIENTS_PORT} \ ${FONTSCALE}:${X_FONTS_TTF_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme CONFLICTS+= kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-4]* kdepim-3.2* .if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS) CONFLICTS+= kdelibs-[0-9]* PKGNAMESUFFIX= -nocups CONFIGURE_ARGS+=--disable-cups PLIST= ${.CURDIR}/../kdelibs3-nocups/pkg-plist .else CONFLICTS+= kdelibs-nocups-[0-9]* LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-base .endif USE_BZIP2= yes USE_FAM= yes USE_GETTEXT= yes USE_GMAKE= yes USE_OPENSSL= yes USE_QT_VER= 3 PREFIX= ${KDE_PREFIX} USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET=# empty CONFIGURE_ARGS+=--disable-ltdl-install \ --disable-as-needed \ --enable-mt \ --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --with-libthai=yes \ --with-lua=no \ --with-ssl-dir=${OPENSSLBASE} CONFIGURE_ENV+= libltdl_cv_shlibext=".so" FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include # bzip2 is required as a libdepend for the help: kioslave .if !exists(/usr/bin/bzip2) LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif # !exists(/usr/bin/bzip2) pre-configure: ${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdeprint/cups/kmcupsmanager.cpp ${REINPLACE_CMD} -e "s,ac_cups_share_test=.*,ac_cups_share_test=\`\$$kde_cups_config --datadir\`,g" \ -e "s,pcreposix.h,pcre.h,g" ${WRKSRC}/configure ${REINPLACE_CMD} -e "s,applications.menu,kde-applications.menu,g" \ ${WRKSRC}/kded/Makefile.in ${WRKSRC}/kded/kbuildsycoca.cpp ${REINPLACE_CMD} -e "s,hicolor,,g" ${WRKSRC}/pics/Makefile.in ${REINPLACE_CMD} -e "s,/etc/exports,/nonexistent,g" \ -e "s,/etc/samba/,${LOCALBASE}/etc/,g" \ -e "s,/etc/security/,${LOCALBASE}/etc/,g" \ -e "s,'fileshare','network',g" \ ${WRKSRC}/kio/misc/fileshareset ${MV} ${WRKSRC}/kded/applications.menu ${WRKSRC}/kded/kde-applications.menu post-configure: ${TOUCH} ${WRKSRC}/dcop/dcop-path.h.in ${TOUCH} ${WRKSRC}/kdecore/kdemacros.h.in ${TOUCH} ${WRKSRC}/kio/kssl/ksslconfig.h.in ${TOUCH} ${WRKSRC}/kjs/global.h.in post-install: ${MKDIR} ${PREFIX}/etc/rc.d ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh \ > ${PREFIX}/etc/rc.d/kdelibs.sh ${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/kdelibs.sh ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/etc/rc.d/kdelibs.sh .include Property changes on: head/x11/kdelibs3/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.209 \ No newline at end of property +1.210 \ No newline at end of property Index: head/x11/kdelibs3/files/patch-khtml_ecma-kjs_html.cpp =================================================================== --- head/x11/kdelibs3/files/patch-khtml_ecma-kjs_html.cpp (nonexistent) +++ head/x11/kdelibs3/files/patch-khtml_ecma-kjs_html.cpp (revision 186672) @@ -0,0 +1,36 @@ +--- khtml/ecma/kjs_html.cpp 2007/02/26 16:39:44 637497 ++++ khtml/ecma/kjs_html.cpp 2007/03/05 13:15:20 639609 +@@ -1866,10 +1866,12 @@ + getDOMNode(exec, frameElement.contentDocument()) : Undefined(); + case FrameContentWindow: { + KHTMLPart* part = static_cast(frameElement.handle())->contentPart(); +- if (part) +- return Value(Window::retrieveWindow(part)); +- else +- return Undefined(); ++ if (part) { ++ Window *w = Window::retrieveWindow(part); ++ if (w) ++ return Value(w); ++ } ++ return Undefined(); + } + case FrameFrameBorder: return String(frameElement.frameBorder()); + case FrameLongDesc: return String(frameElement.longDesc()); +@@ -1899,10 +1901,12 @@ + getDOMNode(exec, iFrame.contentDocument()) : Undefined(); + case IFrameContentWindow: { + KHTMLPart* part = static_cast(iFrame.handle())->contentPart(); +- if (part) +- return Value(Window::retrieveWindow(part)); +- else +- return Undefined(); ++ if (part) { ++ Window *w = Window::retrieveWindow(part); ++ if (w) ++ return Value(w); ++ } ++ return Undefined(); + } + case IFrameFrameBorder: return String(iFrame.frameBorder()); + case IFrameHeight: return String(iFrame.height()); Property changes on: head/x11/kdelibs3/files/patch-khtml_ecma-kjs_html.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdelibs4/Makefile =================================================================== --- head/x11/kdelibs4/Makefile (revision 186671) +++ head/x11/kdelibs4/Makefile (revision 186672) @@ -1,112 +1,112 @@ # -*-mode: makefile-*- # New ports collection makefile for: KDE libraries 3 # Date created: 2 November 2001 # Whom: will@cvs.kde.org # # $FreeBSD$ # PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src PKGNAMESUFFIX?= # empty DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Base set of libraries needed by KDE programs BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ artsc.0:${PORTSDIR}/audio/arts \ aspell:${PORTSDIR}/textproc/aspell \ dns_sd:${PORTSDIR}/net/mDNSResponder \ idn:${PORTSDIR}/dns/libidn \ jasper:${PORTSDIR}/graphics/jasper \ pcre:${PORTSDIR}/devel/pcre \ thai:${PORTSDIR}/devel/libthai \ tiff.4:${PORTSDIR}/graphics/tiff \ xml2.5:${PORTSDIR}/textproc/libxml2 \ xslt.2:${PORTSDIR}/textproc/libxslt RUN_DEPENDS= kdehier>0:${PORTSDIR}/misc/kdehier \ iceauth:${X_CLIENTS_PORT} \ ${FONTSCALE}:${X_FONTS_TTF_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme CONFLICTS+= kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-4]* kdepim-3.2* .if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS) CONFLICTS+= kdelibs-[0-9]* PKGNAMESUFFIX= -nocups CONFIGURE_ARGS+=--disable-cups PLIST= ${.CURDIR}/../kdelibs3-nocups/pkg-plist .else CONFLICTS+= kdelibs-nocups-[0-9]* LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-base .endif USE_BZIP2= yes USE_FAM= yes USE_GETTEXT= yes USE_GMAKE= yes USE_OPENSSL= yes USE_QT_VER= 3 PREFIX= ${KDE_PREFIX} USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET=# empty CONFIGURE_ARGS+=--disable-ltdl-install \ --disable-as-needed \ --enable-mt \ --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --with-libthai=yes \ --with-lua=no \ --with-ssl-dir=${OPENSSLBASE} CONFIGURE_ENV+= libltdl_cv_shlibext=".so" FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include # bzip2 is required as a libdepend for the help: kioslave .if !exists(/usr/bin/bzip2) LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif # !exists(/usr/bin/bzip2) pre-configure: ${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdeprint/cups/kmcupsmanager.cpp ${REINPLACE_CMD} -e "s,ac_cups_share_test=.*,ac_cups_share_test=\`\$$kde_cups_config --datadir\`,g" \ -e "s,pcreposix.h,pcre.h,g" ${WRKSRC}/configure ${REINPLACE_CMD} -e "s,applications.menu,kde-applications.menu,g" \ ${WRKSRC}/kded/Makefile.in ${WRKSRC}/kded/kbuildsycoca.cpp ${REINPLACE_CMD} -e "s,hicolor,,g" ${WRKSRC}/pics/Makefile.in ${REINPLACE_CMD} -e "s,/etc/exports,/nonexistent,g" \ -e "s,/etc/samba/,${LOCALBASE}/etc/,g" \ -e "s,/etc/security/,${LOCALBASE}/etc/,g" \ -e "s,'fileshare','network',g" \ ${WRKSRC}/kio/misc/fileshareset ${MV} ${WRKSRC}/kded/applications.menu ${WRKSRC}/kded/kde-applications.menu post-configure: ${TOUCH} ${WRKSRC}/dcop/dcop-path.h.in ${TOUCH} ${WRKSRC}/kdecore/kdemacros.h.in ${TOUCH} ${WRKSRC}/kio/kssl/ksslconfig.h.in ${TOUCH} ${WRKSRC}/kjs/global.h.in post-install: ${MKDIR} ${PREFIX}/etc/rc.d ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh \ > ${PREFIX}/etc/rc.d/kdelibs.sh ${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/kdelibs.sh ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/etc/rc.d/kdelibs.sh .include Property changes on: head/x11/kdelibs4/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.209 \ No newline at end of property +1.210 \ No newline at end of property Index: head/x11/kdelibs4/files/patch-khtml_ecma-kjs_html.cpp =================================================================== --- head/x11/kdelibs4/files/patch-khtml_ecma-kjs_html.cpp (nonexistent) +++ head/x11/kdelibs4/files/patch-khtml_ecma-kjs_html.cpp (revision 186672) @@ -0,0 +1,36 @@ +--- khtml/ecma/kjs_html.cpp 2007/02/26 16:39:44 637497 ++++ khtml/ecma/kjs_html.cpp 2007/03/05 13:15:20 639609 +@@ -1866,10 +1866,12 @@ + getDOMNode(exec, frameElement.contentDocument()) : Undefined(); + case FrameContentWindow: { + KHTMLPart* part = static_cast(frameElement.handle())->contentPart(); +- if (part) +- return Value(Window::retrieveWindow(part)); +- else +- return Undefined(); ++ if (part) { ++ Window *w = Window::retrieveWindow(part); ++ if (w) ++ return Value(w); ++ } ++ return Undefined(); + } + case FrameFrameBorder: return String(frameElement.frameBorder()); + case FrameLongDesc: return String(frameElement.longDesc()); +@@ -1899,10 +1901,12 @@ + getDOMNode(exec, iFrame.contentDocument()) : Undefined(); + case IFrameContentWindow: { + KHTMLPart* part = static_cast(iFrame.handle())->contentPart(); +- if (part) +- return Value(Window::retrieveWindow(part)); +- else +- return Undefined(); ++ if (part) { ++ Window *w = Window::retrieveWindow(part); ++ if (w) ++ return Value(w); ++ } ++ return Undefined(); + } + case IFrameFrameBorder: return String(iFrame.frameBorder()); + case IFrameHeight: return String(iFrame.height()); Property changes on: head/x11/kdelibs4/files/patch-khtml_ecma-kjs_html.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property