diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /x11/kdebase4 | |
| parent | Update to version 2.2.6 (diff) | |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=211584
Diffstat (limited to 'x11/kdebase4')
| -rw-r--r-- | x11/kdebase4/Makefile | 8 | ||||
| -rw-r--r-- | x11/kdebase4/files/pkg-message.in | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 975b37108866..c07439e0b9a8 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kdebase4/files/pkg-message.in b/x11/kdebase4/files/pkg-message.in index 34663a8e2907..dfc3f83e715e 100644 --- a/x11/kdebase4/files/pkg-message.in +++ b/x11/kdebase4/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. |