dependencies, dependencies...

don't rely on samba3 yet, need to check it.
use sasl2 and usb where applicable.
This commit is contained in:
espie 2005-03-30 19:25:23 +00:00
parent 50094f7c5e
commit a3551d6bb7
4 changed files with 56 additions and 14 deletions

View File

@ -1,18 +1,20 @@
# $OpenBSD: Makefile,v 1.39 2005/03/29 21:18:35 espie Exp $ # $OpenBSD: Makefile,v 1.40 2005/03/30 19:25:23 espie Exp $
COMMENT= "K Desktop Environment, basic applications" COMMENT= "K Desktop Environment, basic applications"
COMMENT-plugins= "Konqueror nsplugins, essentially native JDK" COMMENT-plugins= "Konqueror nsplugins, essentially native JDK"
CATEGORIES= x11 x11/kde CATEGORIES= x11 x11/kde
VERSION= 3.4.0 VERSION= 3.4.0
DISTNAME= kdebase-${VERSION} DISTNAME= kdebase-${VERSION}
PKGNAME= ${DISTNAME} PKGNAME= ${DISTNAME}p0
MODKDE_VERSION?= 3.4 MODKDE_VERSION?= 3.4
FLAVORS= debug FLAVORS= debug
LIB_DEPENDS= kdecore.6,kabc,katepartinterfaces,kdefakes,kdefx,kdeprint,kdeprint_management,kdesasl,kdesu,kdeui,khtml,kio,kjs,kmdi,kmid,kparts,kresources,kscreensaver,kscript,ktexteditor,kutils,kwalletclient,DCOP,vcard,artskde::x11/kde/libs3 \ LIB_DEPENDS= kdecore.6,kabc,katepartinterfaces,kdefakes,kdefx,kdnssd,kdeprint,kdeprint_management,kdesu,kdeui,khtml,kio,kjs,knewstuff,kmid,kmdi2,kparts,kresources,kscreensaver,kscript,ktexteditor,kutils,kwalletclient,DCOP,vcard,artskde::x11/kde/libs3 \
lber,ldap.2:openldap-client-2.*:databases/openldap lber,ldap.2:openldap-client-2.*:databases/openldap \
sasl2::security/cyrus-sasl2 \
usb::devel/libusb
BUILD_DEPENDS+=::devel/pkgconfig
SEPARATE_BUILD= flavored SEPARATE_BUILD= flavored
EXTRA_CONFIG= xdg/menus/kde-settings.menu \ EXTRA_CONFIG= xdg/menus/kde-settings.menu \
@ -21,16 +23,12 @@ EXTRA_CONFIG= xdg/menus/kde-settings.menu \
xdg/menus/applications-merged/kde-essential.menu \ xdg/menus/applications-merged/kde-essential.menu \
ksysguarddrc ksysguarddrc
#MULTI_PACKAGES=-plugins LIB_DEPENDS+= \
FULLPKGNAME-plugins=kdensplugins-${VERSION}
SUBPACKAGE?=
.if !defined(PACKAGING) || ${SUBPACKAGE} == "-plugins"
LIB_DEPENDS+= Xm::x11/openmotif \
glib-2.0.0.0,gmodule-2.0.0.0,gthread-2.0.0.0::devel/glib2 glib-2.0.0.0,gmodule-2.0.0.0,gthread-2.0.0.0::devel/glib2
.endif
CONFIGURE_ENV+=ac_cv_header_libsmbclient=no
SAMPLECONFDIR=${PREFIX}/share/apps/kde-conf-sample SAMPLECONFDIR=${PREFIX}/share/apps/kde-conf-sample
SUBST_VARS=EXTRA_CONFIG SAMPLECONFDIR SUBST_VARS=EXTRA_CONFIG SAMPLECONFDIR
@ -41,12 +39,14 @@ post-install:
FAKE_FLAGS=DESTDIR=${WRKINST} sysconfdir=${SAMPLECONFDIR} FAKE_FLAGS=DESTDIR=${WRKINST} sysconfdir=${SAMPLECONFDIR}
CONFIGURE_ARGS+=--without-motif #CONFIGURE_ARGS+=--without-motif
WANTLIB= ICE SM X11 Xcursor Xext Xrandr Xrender Xss Xt Xtst Xxf86misc \ WANTLIB= ICE SM X11 Xcursor Xext Xrandr Xrender Xss Xt Xtst Xxf86misc \
art_lgpl_2 artsflow artsflow_idl audiofile c crypto esd \ art_lgpl_2 artsflow artsflow_idl audiofile c crypto esd \
freetype iconv intl jpeg kmedia2_idl m mad mcop ogg ossaudio \ freetype iconv intl jpeg kmedia2_idl m mad mcop ogg ossaudio \
pcre pcreposix png pthread qtmcop soundserver_idl ssl stdc++ \ pcre pcreposix png pthread qtmcop soundserver_idl ssl stdc++ \
util vorbis vorbisenc vorbisfile xkbfile z util vorbis vorbisenc vorbisfile xkbfile z GLU fontenc \
Xinerama Xft Xfixes fontconfig GL Xcomposite Xdamage \
Half Imath IlmImf Iex
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-configure_in,v 1.13 2005/03/30 19:25:23 espie Exp $
--- configure.in.orig Wed Mar 30 12:55:45 2005
+++ configure.in Wed Mar 30 12:57:09 2005
@@ -548,6 +548,7 @@ if test "$KFI_FOUND_FREETYPE" -eq 1; the
*-*-aix*) UNAME='AIX' ;;
*-*-hpux*) UNAME='HPUX' ;;
*-*-darwin*) UNAME='Darwin' ;;
+ *-*-openbsd*) UNAME='OpenBSD';;
*) UNAME='Unknown' ;;
esac
AC_MSG_RESULT($UNAME)

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-kcontrol_kfontinst_configure_in_in,v 1.1 2005/03/30 19:25:23 espie Exp $
--- kcontrol/kfontinst/configure.in.in.orig Wed Mar 30 13:00:20 2005
+++ kcontrol/kfontinst/configure.in.in Wed Mar 30 13:00:38 2005
@@ -89,6 +89,7 @@ if test "$KFI_FOUND_FREETYPE" -eq 1; the
*-*-linux*) UNAME='Linux' ;;
*-*-freebsd*) UNAME='FreeBSD' ;;
*-*-netbsd*) UNAME='NetBSD' ;;
+ *-*-openbsd*) UNAME='OpenBSD' ;;
*-*-solaris*) UNAME='Solaris' ;;
*-*-irix*) UNAME='Irix' ;;
*-*-aix*) UNAME='AIX' ;;

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-kcontrol_kfontinst_kfontinst_GetPid_c,v 1.1 2005/03/30 19:25:23 espie Exp $
--- kcontrol/kfontinst/kfontinst/GetPid.c.orig Wed Mar 30 12:59:19 2005
+++ kcontrol/kfontinst/kfontinst/GetPid.c Wed Mar 30 13:00:11 2005
@@ -55,6 +55,7 @@
Linux Tested on Linux 2.4
FreeBSD Tested on FreeBSD 5.1 by Brian Ledbetter <brian@shadowcom.net>
NetBSD
+ OpenBSD
Irix
Solaris Tested on Solaris 8 x86 by Torsten Kasch <tk@Genetik.Uni-Bielefeld.DE>
HP-UX Tested on HP-UX B.11.11 U 9000/800
@@ -160,7 +161,7 @@ unsigned int kfi_getPid(const char *proc
return error ? 0 : pid;
}
-#elif defined OS_FreeBSD || defined OS_NetBSD || defined __FreeBSD__ || defined __NetBSD__ || defined OS_Darwin
+#elif defined OS_FreeBSD || defined OS_NetBSD || defined __FreeBSD__ || defined __NetBSD__ || defined OS_Darwin || defined OS_OpenBSD || defined __OpenBSD__
#include <ctype.h>
#include <dirent.h>