diff options
| -rw-r--r-- | freebsd/applications/abakus/Makefile | 2 | ||||
| -rw-r--r-- | freebsd/dependencies/tqt3/Makefile | 4 | ||||
| -rw-r--r-- | freebsd/libraries/kipi-plugins/Makefile | 2 | ||||
| -rw-r--r-- | freebsd/libraries/libkdcraw/Makefile | 2 | ||||
| -rw-r--r-- | freebsd/tdeartwork/Makefile | 2 | ||||
| -rw-r--r-- | freebsd/tdebase/Makefile | 3 | ||||
| -rw-r--r-- | freebsd/tdepim/Makefile | 2 | ||||
| -rw-r--r-- | freebsd/tdepim/pkg-plist | 30 | ||||
| -rw-r--r-- | freebsd/trinity.port.mk | 1 |
9 files changed, 10 insertions, 38 deletions
diff --git a/freebsd/applications/abakus/Makefile b/freebsd/applications/abakus/Makefile index 107464b11..d6789540b 100644 --- a/freebsd/applications/abakus/Makefile +++ b/freebsd/applications/abakus/Makefile @@ -17,6 +17,8 @@ DIST_SUBDIR= TDE/applications BUILD_DEPENDS+= ${TDE_PREFIX}/lib/libartsc.so:${PORTSDIR}/x11/trinity/dependencies/arts \ ${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/tdelibs +BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison + LIB_DEPENDS+= libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface # Build diff --git a/freebsd/dependencies/tqt3/Makefile b/freebsd/dependencies/tqt3/Makefile index 2ac5a6154..5cbb7cefa 100644 --- a/freebsd/dependencies/tqt3/Makefile +++ b/freebsd/dependencies/tqt3/Makefile @@ -25,7 +25,7 @@ BUILD_DEPENDS+= tqmake:${PORTSDIR}/x11/trinity/dependencies/tqmake LIB_DEPENDS+= libmng.so:${PORTSDIR}/graphics/libmng \ libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libjpeg.so:${PORTSDIR}/graphics/jpeg-turbo \ libglib-2.0.so:${PORTSDIR}/devel/glib20 USE_XORG= xcursor xinerama sm inputproto xi @@ -162,7 +162,7 @@ CONFIGURE_ARGS+=-disable-opengl .endif # WITHOUT_OPENGL .if ${PORT_OPTIONS:MCUPS} -LIB_DEPENDS+= libcups.so.2:${PORTSDIR}/print/cups-client +LIB_DEPENDS+= libcups.so.2:${PORTSDIR}/print/cups CUPS= -cups -L${LOCALBASE}/lib -I${LOCALBASE}/include .endif diff --git a/freebsd/libraries/kipi-plugins/Makefile b/freebsd/libraries/kipi-plugins/Makefile index 104e6b739..1a9be126c 100644 --- a/freebsd/libraries/kipi-plugins/Makefile +++ b/freebsd/libraries/kipi-plugins/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS+= ${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/tdelibs LIB_DEPENDS+= libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface -BUILD_DEPENDS+=\ +LIB_DEPENDS+=\ libexiv2.so:${PORTSDIR}/graphics/exiv2 \ libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 \ libgpod.so:${PORTSDIR}/audio/libgpod \ diff --git a/freebsd/libraries/libkdcraw/Makefile b/freebsd/libraries/libkdcraw/Makefile index 083d9f453..71f09f293 100644 --- a/freebsd/libraries/libkdcraw/Makefile +++ b/freebsd/libraries/libkdcraw/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS+= ${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/tdelibs LIB_DEPENDS+= libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface LIB_DEPENDS+=\ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libjpeg.so:${PORTSDIR}/graphics/jpeg-turbo \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ # Build diff --git a/freebsd/tdeartwork/Makefile b/freebsd/tdeartwork/Makefile index 2c202a364..a054b1610 100644 --- a/freebsd/tdeartwork/Makefile +++ b/freebsd/tdeartwork/Makefile @@ -24,7 +24,7 @@ BUILD_DEPENDS+=\ xscreensaver:${PORTSDIR}/x11/xscreensaver \ LIB_DEPENDS+=\ - libGL.so:${PORTSDIR}/graphics/libGL \ + libGL.so:${PORTSDIR}/graphics/mesa-libs \ libGLU.so:${PORTSDIR}/graphics/libGLU \ libXss.so:${PORTSDIR}/x11/libXScrnSaver \ diff --git a/freebsd/tdebase/Makefile b/freebsd/tdebase/Makefile index 9d5100961..45a9d893b 100644 --- a/freebsd/tdebase/Makefile +++ b/freebsd/tdebase/Makefile @@ -35,7 +35,6 @@ BUILD_DEPENDS+=\ LIB_DEPENDS+=\ libconfig.so:${PORTSDIR}/devel/libconfig \ libldap.so:${PORTSDIR}/net/openldap24-client \ - libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient \ libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \ libhal-storage.so:${PORTSDIR}/sysutils/hal \ libxkbfile.so:${PORTSDIR}/x11/libxkbfile \ @@ -47,6 +46,8 @@ RUN_DEPENDS+=\ xset:${PORTSDIR}/x11/xset \ xsetroot:${PORTSDIR}/x11/xsetroot \ +USES+= samba + # Build post-patch: tde-pathfix cd ${WRKSRC}; \ diff --git a/freebsd/tdepim/Makefile b/freebsd/tdepim/Makefile index b02dd1e92..0a718bdc7 100644 --- a/freebsd/tdepim/Makefile +++ b/freebsd/tdepim/Makefile @@ -27,7 +27,6 @@ LIB_DEPENDS+= libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \ LIB_DEPENDS+=\ libboost_system.so:${PORTSDIR}/devel/boost-libs \ libical.so:${PORTSDIR}/devel/libical \ - libopensync.so.0:${PORTSDIR}/devel/libopensync022 \ libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \ libgpgme.so:${PORTSDIR}/security/gpgme \ libXss.so:${PORTSDIR}/x11/libXScrnSaver @@ -39,7 +38,6 @@ do-configure: tde-cmake-prepare ${TDE_CMAKE_CONFIGURE} \ \ -DBUILD_ALL="ON" \ - -DBUILD_KITCHENSYNC="ON" \ -DWITH_ARTS="ON" \ -DWITH_SASL="ON" \ -DWITH_NEWDISTRLISTS="ON" \ diff --git a/freebsd/tdepim/pkg-plist b/freebsd/tdepim/pkg-plist index 132abebf2..8375ac64a 100644 --- a/freebsd/tdepim/pkg-plist +++ b/freebsd/tdepim/pkg-plist @@ -11,7 +11,6 @@ bin/kalarmd bin/kandy bin/kandy_client bin/karm -bin/kitchensync bin/kleopatra bin/kmail bin/kmail_antivir.sh @@ -328,10 +327,6 @@ lib/libkholidays.la lib/libkholidays.so lib/libkholidays.so.1 lib/libkholidays.so.1.0.0 -lib/libkitchensync.la -lib/libkitchensync.so -lib/libkitchensync.so.0 -lib/libkitchensync.so.0.0.0 lib/libkleopatra.la lib/libkleopatra.so lib/libkleopatra.so.1 @@ -430,10 +425,6 @@ lib/libqgpgme.la lib/libqgpgme.so lib/libqgpgme.so.0 lib/libqgpgme.so.0.0.0 -lib/libqopensync.la -lib/libqopensync.so -lib/libqopensync.so.0 -lib/libqopensync.so.0.0.0 lib/libtdeabc_carddav.la lib/libtdeabc_carddav.so lib/libtdeabc_carddav.so.1 @@ -575,8 +566,6 @@ lib/trinity/libkaddressbookpart.la lib/trinity/libkaddressbookpart.so lib/trinity/libkarmpart.la lib/trinity/libkarmpart.so -lib/trinity/libkitchensyncpart.la -lib/trinity/libkitchensyncpart.so lib/trinity/libkmail_bodypartformatter_application_octetstream.la lib/trinity/libkmail_bodypartformatter_application_octetstream.so lib/trinity/libkmail_bodypartformatter_text_calendar.la @@ -681,7 +670,6 @@ share/applications/tde/kaddressbook.desktop share/applications/tde/kalarm.desktop share/applications/tde/kandy.desktop share/applications/tde/karm.desktop -share/applications/tde/kitchensync.desktop share/applications/tde/kleopatra.desktop share/applications/tde/kleopatra_import.desktop share/applications/tde/kmail_view.desktop @@ -787,20 +775,6 @@ share/apps/kgantt/icons/crystalsvg/22x22/actions/ganttUnselecttask.png share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttSelect.png share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttSelecttask.png share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttUnselecttask.png -share/apps/kitchensync/about/kitchensync.css -share/apps/kitchensync/about/main.html -share/apps/kitchensync/about/top-right-kitchensync.png -share/apps/kitchensync/icons/crystalsvg/128x128/apps/mobile_phone.png -share/apps/kitchensync/icons/crystalsvg/16x16/actions/hotsync.png -share/apps/kitchensync/icons/crystalsvg/16x16/apps/mobile_phone.png -share/apps/kitchensync/icons/crystalsvg/22x22/actions/hotsync.png -share/apps/kitchensync/icons/crystalsvg/32x32/actions/hotsync.png -share/apps/kitchensync/icons/crystalsvg/32x32/apps/mobile_phone.png -share/apps/kitchensync/icons/crystalsvg/48x48/actions/hotsync.png -share/apps/kitchensync/icons/crystalsvg/48x48/apps/mobile_phone.png -share/apps/kitchensync/icons/crystalsvg/64x64/apps/mobile_phone.png -share/apps/kitchensync/kitchensync_part.rc -share/apps/kitchensync/kitchensyncui.rc share/apps/kleopatra/kleopatraui.rc share/apps/kmail/about/box-center.png share/apps/kmail/about/kmail.css @@ -1514,7 +1488,6 @@ share/icons/hicolor/16x16/apps/akregator.png share/icons/hicolor/16x16/apps/kaddressbook.png share/icons/hicolor/16x16/apps/kalarm.png share/icons/hicolor/16x16/apps/karm.png -share/icons/hicolor/16x16/apps/kitchensync.png share/icons/hicolor/16x16/apps/kmail.png share/icons/hicolor/16x16/apps/kmobile.png share/icons/hicolor/16x16/apps/knode.png @@ -1525,7 +1498,6 @@ share/icons/hicolor/16x16/apps/korganizer.png share/icons/hicolor/16x16/apps/korn.png share/icons/hicolor/22x22/apps/akregator.png share/icons/hicolor/22x22/apps/karm.png -share/icons/hicolor/22x22/apps/kitchensync.png share/icons/hicolor/22x22/apps/kmail.png share/icons/hicolor/22x22/apps/knotes.png share/icons/hicolor/22x22/apps/kontact.png @@ -1533,7 +1505,6 @@ share/icons/hicolor/32x32/apps/akregator.png share/icons/hicolor/32x32/apps/kaddressbook.png share/icons/hicolor/32x32/apps/kalarm.png share/icons/hicolor/32x32/apps/karm.png -share/icons/hicolor/32x32/apps/kitchensync.png share/icons/hicolor/32x32/apps/kmail.png share/icons/hicolor/32x32/apps/kmobile.png share/icons/hicolor/32x32/apps/knode.png @@ -1546,7 +1517,6 @@ share/icons/hicolor/48x48/apps/akregator.png share/icons/hicolor/48x48/apps/kaddressbook.png share/icons/hicolor/48x48/apps/kalarm.png share/icons/hicolor/48x48/apps/karm.png -share/icons/hicolor/48x48/apps/kitchensync.png share/icons/hicolor/48x48/apps/kmail.png share/icons/hicolor/48x48/apps/kmobile.png share/icons/hicolor/48x48/apps/knode.png diff --git a/freebsd/trinity.port.mk b/freebsd/trinity.port.mk index 847007144..f336cabb9 100644 --- a/freebsd/trinity.port.mk +++ b/freebsd/trinity.port.mk @@ -38,6 +38,7 @@ BUILD_DEPENDS=\ automake:${PORTSDIR}/devel/automake \ libtool:${PORTSDIR}/devel/libtool \ cmake:${PORTSDIR}/devel/cmake \ + gettext:${PORTSDIR}/devel/gettext \ gfind:${PORTSDIR}/misc/findutils \ gsed:${PORTSDIR}/textproc/gsed \ bash:${PORTSDIR}/shells/bash \ |