summaryrefslogtreecommitdiffstats
path: root/x11/kdelibs3
diff options
context:
space:
mode:
Diffstat (limited to 'x11/kdelibs3')
-rw-r--r--x11/kdelibs3/Makefile31
-rw-r--r--x11/kdelibs3/distinfo2
-rw-r--r--x11/kdelibs3/files/patch-kdeprint::imagetops25
-rw-r--r--x11/kdelibs3/files/patch-kio::job.cpp11
-rw-r--r--x11/kdelibs3/pkg-plist69
5 files changed, 99 insertions, 39 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 2fe7dd8..0db309f 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kdelibs
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -14,12 +14,16 @@ DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14 \
+ autoconf213:${PORTSDIR}/devel/autoconf213 \
+ objprelink:${PORTSDIR}/devel/objprelink
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
audiofile.0:${PORTSDIR}/audio/libaudiofile \
fam.0:${PORTSDIR}/devel/fam \
- cups.2:${PORTSDIR}/print/cups \
xml2.5:${PORTSDIR}/textproc/libxml2 \
- pcre.0:${PORTSDIR}/devel/pcre
+ pcre.0:${PORTSDIR}/devel/pcre \
+ cups.2:${PORTSDIR}/print/cups-base \
+ xslt.1:${PORTSDIR}/textproc/libxslt
.if !exists(/usr/bin/bzip2)
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif
@@ -32,7 +36,13 @@ USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install \
- --disable-final
+ --enable-objprelink
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
+.endif
.if ${MACHINE_ARCH} == "alpha"
CFLAGS= -O0 ${KDE_CFLAGS}
@@ -68,6 +78,15 @@ pre-extract:
.endif
pre-configure:
+ ${MKDIR} ${WRKSRC}/auto-bin
+.for AC in autoconf autoheader
+ ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
+.endfor
+.for AM in automake aclocal
+ ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
+.endfor
+ cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \
+ ${GMAKE} -f Makefile.cvs
${PERL} -pi -e "s@-O2@-O0@g; s@\"-lfam@\"-L${LOCALBASE}/lib -lfam@g" ${WRKSRC}/configure
${PERL} -pi -e "s@kspell api@@g" ${WRKSRC}/doc/Makefile.in
(find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \
@@ -80,8 +99,8 @@ post-configure:
post-install:
${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh > ${PREFIX}/etc/rc.d/kdelibs.sh
${CHMOD} 755 ${PREFIX}/etc/rc.d/kdelibs.sh
-.for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \
- kparts kspell ksycoca kjava
+.for LIB in DCOP kab kdecore kdesu kdeui kfile kio kjs kparts kspell \
+ ksycoca kjava
@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${SOMAJOR} ${PREFIX}/lib/lib${LIB}.so
.endfor
.for LIB in artsc artsflow artsflow_idl kmid kmedia2_idl qtmcop soundserver_idl
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 0fe3f44..ebfd9d6 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-2.2.1.tar.bz2) = 3aa73b3fe7095b3bab3081bece73f56f
+MD5 (KDE/kdelibs-2.2.2.tar.bz2) = 51ec17dce9c62b50a3c2e97e4511cdcf
diff --git a/x11/kdelibs3/files/patch-kdeprint::imagetops b/x11/kdelibs3/files/patch-kdeprint::imagetops
new file mode 100644
index 0000000..518e0b9
--- /dev/null
+++ b/x11/kdelibs3/files/patch-kdeprint::imagetops
@@ -0,0 +1,25 @@
+--- kdeprint/filters/imagetops.orig Wed Nov 28 12:25:21 2001
++++ kdeprint/filters/imagetops Wed Nov 28 12:29:50 2001
+@@ -27,11 +27,17 @@
+ # check the file mime type, and set the command correspondingly
+ cmd=
+ magic=`file -bi $FILE`
+-if [[ $magic != image/* ]] ; then
+- echo "Not an image"
+- exit 1;
+-fi
+-case ${magic/image\//} in
++
++case $magic in
++ image/*)
++ ;;
++ *)
++ echo "Not an image"
++ exit 1;
++ ;;
++esac
++
++case ${magic##image\/} in
+ jpeg)
+ cmd="djpeg -pnm"
+ ;;
diff --git a/x11/kdelibs3/files/patch-kio::job.cpp b/x11/kdelibs3/files/patch-kio::job.cpp
new file mode 100644
index 0000000..113a0eb
--- /dev/null
+++ b/x11/kdelibs3/files/patch-kio::job.cpp
@@ -0,0 +1,11 @@
+--- kio/job.cpp.20011019 Fri Oct 19 16:09:57 2001
++++ kio/job.cpp Tue Oct 30 21:49:15 2001
+@@ -2472,7 +2472,7 @@
+ // But for files coming from TAR, we want to preserve permissions -> we use default perms only if from remote
+ // The real fix would be KProtocolInfo::inputType(protocol) == T_FILESYSTEM, but we can't access ksycoca from here !
+ bool remoteSource = !(*it).uSource.isLocalFile() && ((*it).uSource.protocol() != "tar"); // HACK
+- mode_t permissions = ( remoteSource && (*it).uDest.isLocalFile() ) ? (mode_t)-1 : (*it).permissions;
++ int permissions = ( remoteSource && (*it).uDest.isLocalFile() ) ? -1 : (*it).permissions;
+ KIO::FileCopyJob * copyJob = KIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ );
+ copyJob->setSourceSize( (*it).size );
+ newjob = copyJob;
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 990f3f2..db707e1 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -1,4 +1,3 @@
-@exec %%LDCONFIG%% -m %D/lib/kde2
bin/artsc-config
bin/artscat
bin/artsd
@@ -156,6 +155,7 @@ include/kallocator.h
include/kalphapainter.h
include/kanimwidget.h
include/kapp.h
+include/kapplication.h
include/karrowbutton.h
include/kasyncio.h
include/kaudioplayer.h
@@ -407,6 +407,7 @@ include/ksslpkcs12.h
include/ksslsettings.h
include/ksslutils.h
include/ksslx509map.h
+include/kstandarddirs.h
include/kstartupinfo.h
include/kstaticdeleter.h
include/kstatusbar.h
@@ -433,6 +434,7 @@ include/ktoolbarbutton.h
include/ktoolbarradiogroup.h
include/ktrader.h
include/kuniqueapp.h
+include/kuniqueapplication.h
include/kunload.h
include/kurifilter.h
include/kurl.h
@@ -578,6 +580,8 @@ lib/libkab.so.4
lib/libkdecore.la
lib/libkdecore.so
lib/libkdecore.so.4
+lib/libkded_kssld.la
+lib/libkded_kssld.so
lib/libkdefakes.la
lib/libkdefakes.so
lib/libkdefakes.so.4
@@ -596,7 +600,6 @@ lib/libkdeui.so.4
lib/libkfile.la
lib/libkfile.so
lib/libkfile.so.4
-lib/libkformula.so
lib/libkhtml.la
lib/libkhtml.so
lib/libkhtml.so.4
@@ -1009,20 +1012,6 @@ share/apps/ksgmltools2/customization/nl/entities/update-doc.docbook
share/apps/ksgmltools2/customization/nl/lang.entities
share/apps/ksgmltools2/customization/nl/strings.entities
share/apps/ksgmltools2/customization/nl/user.entities
-share/apps/ksgmltools2/customization/no/catalog
-share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook
-share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook
-share/apps/ksgmltools2/customization/no/entities/lgpl-notice.docbook
-share/apps/ksgmltools2/customization/no/entities/report-bugs.docbook
-share/apps/ksgmltools2/customization/no/entities/underArtisticLicense.docbook
-share/apps/ksgmltools2/customization/no/entities/underBSDLicense.docbook
-share/apps/ksgmltools2/customization/no/entities/underFDL.docbook
-share/apps/ksgmltools2/customization/no/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/no/entities/underX11License.docbook
-share/apps/ksgmltools2/customization/no/entities/update-doc.docbook
-share/apps/ksgmltools2/customization/no/lang.entities
-share/apps/ksgmltools2/customization/no/strings.entities
-share/apps/ksgmltools2/customization/no/user.entities
share/apps/ksgmltools2/customization/no-NY/catalog
share/apps/ksgmltools2/customization/no-NY/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/no-NY/entities/gpl-notice.docbook
@@ -1037,6 +1026,20 @@ share/apps/ksgmltools2/customization/no-NY/entities/update-doc.docbook
share/apps/ksgmltools2/customization/no-NY/lang.entities
share/apps/ksgmltools2/customization/no-NY/strings.entities
share/apps/ksgmltools2/customization/no-NY/user.entities
+share/apps/ksgmltools2/customization/no/catalog
+share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/no/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/no/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/no/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/no/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/no/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/no/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/no/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/no/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/no/lang.entities
+share/apps/ksgmltools2/customization/no/strings.entities
+share/apps/ksgmltools2/customization/no/user.entities
share/apps/ksgmltools2/customization/pl/catalog
share/apps/ksgmltools2/customization/pl/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/pl/entities/gpl-notice.docbook
@@ -1051,20 +1054,6 @@ share/apps/ksgmltools2/customization/pl/entities/update-doc.docbook
share/apps/ksgmltools2/customization/pl/lang.entities
share/apps/ksgmltools2/customization/pl/strings.entities
share/apps/ksgmltools2/customization/pl/user.entities
-share/apps/ksgmltools2/customization/pt/catalog
-share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook
-share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook
-share/apps/ksgmltools2/customization/pt/entities/lgpl-notice.docbook
-share/apps/ksgmltools2/customization/pt/entities/report-bugs.docbook
-share/apps/ksgmltools2/customization/pt/entities/underArtisticLicense.docbook
-share/apps/ksgmltools2/customization/pt/entities/underBSDLicense.docbook
-share/apps/ksgmltools2/customization/pt/entities/underFDL.docbook
-share/apps/ksgmltools2/customization/pt/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/pt/entities/underX11License.docbook
-share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook
-share/apps/ksgmltools2/customization/pt/lang.entities
-share/apps/ksgmltools2/customization/pt/strings.entities
-share/apps/ksgmltools2/customization/pt/user.entities
share/apps/ksgmltools2/customization/pt-BR/catalog
share/apps/ksgmltools2/customization/pt-BR/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/pt-BR/entities/gpl-notice.docbook
@@ -1079,6 +1068,20 @@ share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook
share/apps/ksgmltools2/customization/pt-BR/lang.entities
share/apps/ksgmltools2/customization/pt-BR/strings.entities
share/apps/ksgmltools2/customization/pt-BR/user.entities
+share/apps/ksgmltools2/customization/pt/catalog
+share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/pt/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/pt/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/pt/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/pt/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/pt/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/pt/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/pt/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/pt/lang.entities
+share/apps/ksgmltools2/customization/pt/strings.entities
+share/apps/ksgmltools2/customization/pt/user.entities
share/apps/ksgmltools2/customization/ro/catalog
share/apps/ksgmltools2/customization/ro/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/ro/entities/gpl-notice.docbook
@@ -1295,6 +1298,7 @@ share/apps/ksgmltools2/docbook/xsl/common/subtitles.xsl
share/apps/ksgmltools2/docbook/xsl/common/sv.xml
share/apps/ksgmltools2/docbook/xsl/common/titles.xsl
share/apps/ksgmltools2/docbook/xsl/common/tr.xml
+share/apps/ksgmltools2/docbook/xsl/common/xh.xml
share/apps/ksgmltools2/docbook/xsl/common/zh_cn.xml
share/apps/ksgmltools2/docbook/xsl/common/zh_tw.xml
share/apps/ksgmltools2/docbook/xsl/html/ChangeLog
@@ -2585,6 +2589,7 @@ share/services/kaclplugin.desktop
share/services/kbzip2filter.desktop
share/services/kcookiejar.desktop
share/services/kded/kdeprintd.desktop
+share/services/kded/kssld.desktop
share/services/kgzipfilter.desktop
share/services/khtml.desktop
share/services/khtmlimage.desktop
@@ -2687,15 +2692,15 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/apps/ksgmltools2/customization/ru
@dirrm share/apps/ksgmltools2/customization/ro/entities
@dirrm share/apps/ksgmltools2/customization/ro
+@dirrm share/apps/ksgmltools2/customization/pt/entities
@dirrm share/apps/ksgmltools2/customization/pt-BR/entities
@dirrm share/apps/ksgmltools2/customization/pt-BR
-@dirrm share/apps/ksgmltools2/customization/pt/entities
@dirrm share/apps/ksgmltools2/customization/pt
@dirrm share/apps/ksgmltools2/customization/pl/entities
@dirrm share/apps/ksgmltools2/customization/pl
+@dirrm share/apps/ksgmltools2/customization/no/entities
@dirrm share/apps/ksgmltools2/customization/no-NY/entities
@dirrm share/apps/ksgmltools2/customization/no-NY
-@dirrm share/apps/ksgmltools2/customization/no/entities
@dirrm share/apps/ksgmltools2/customization/no
@dirrm share/apps/ksgmltools2/customization/nl/entities
@dirrm share/apps/ksgmltools2/customization/nl
OpenPOWER on IntegriCloud