diff options
author | arved <arved@FreeBSD.org> | 2003-06-03 02:12:01 +0800 |
---|---|---|
committer | arved <arved@FreeBSD.org> | 2003-06-03 02:12:01 +0800 |
commit | 28526a7508fb9d69d0d1656a204497ee5e9a6095 (patch) | |
tree | 54f4d00a5ca4f5b84ede24031f91411910289f4b /x11 | |
parent | 6bdc25163d33c46453da732c7838f09c41a22ee0 (diff) | |
download | freebsd-ports-gnome-28526a7508fb9d69d0d1656a204497ee5e9a6095.tar.gz freebsd-ports-gnome-28526a7508fb9d69d0d1656a204497ee5e9a6095.tar.zst freebsd-ports-gnome-28526a7508fb9d69d0d1656a204497ee5e9a6095.zip |
- Conditional ldap support
- Remove some ancient configure args
- Bump PORTREVISION
Submitted by: Michael Nottebrock <michaelnottebrock@gmx.net>
Diffstat (limited to 'x11')
-rw-r--r-- | x11/kde4-baseapps/Makefile | 13 | ||||
-rw-r--r-- | x11/kde4-baseapps/files/plist.ldap | 3 | ||||
-rw-r--r-- | x11/kde4-runtime/Makefile | 13 | ||||
-rw-r--r-- | x11/kde4-runtime/files/plist.ldap | 3 | ||||
-rw-r--r-- | x11/kde4-workspace/Makefile | 13 | ||||
-rw-r--r-- | x11/kde4-workspace/files/plist.ldap | 3 | ||||
-rw-r--r-- | x11/kdebase3/Makefile | 13 | ||||
-rw-r--r-- | x11/kdebase3/files/plist.ldap | 3 | ||||
-rw-r--r-- | x11/kdebase4-runtime/Makefile | 13 | ||||
-rw-r--r-- | x11/kdebase4-runtime/files/plist.ldap | 3 | ||||
-rw-r--r-- | x11/kdebase4-workspace/Makefile | 13 | ||||
-rw-r--r-- | x11/kdebase4-workspace/files/plist.ldap | 3 | ||||
-rw-r--r-- | x11/kdebase4/Makefile | 13 | ||||
-rw-r--r-- | x11/kdebase4/files/plist.ldap | 3 |
14 files changed, 77 insertions, 35 deletions
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 1ae4170f6ed5..e551153728dc 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src @@ -33,16 +33,19 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no -CONFIGURE_ARGS+=--disable-ltdl-install \ - --without-ldap \ - --disable-closure \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> +# This enables kio_ldap (needed by kaddresbook). +.if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so) +LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap21 +PLIST_APPEND+= plist.ldap +.endif + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif # exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kde4-baseapps/files/plist.ldap b/x11/kde4-baseapps/files/plist.ldap new file mode 100644 index 000000000000..082395fd0498 --- /dev/null +++ b/x11/kde4-baseapps/files/plist.ldap @@ -0,0 +1,3 @@ +lib/kde3/kio_ldap.la +lib/kde3/kio_ldap.so +share/services/ldap.protocol diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 1ae4170f6ed5..e551153728dc 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src @@ -33,16 +33,19 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no -CONFIGURE_ARGS+=--disable-ltdl-install \ - --without-ldap \ - --disable-closure \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> +# This enables kio_ldap (needed by kaddresbook). +.if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so) +LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap21 +PLIST_APPEND+= plist.ldap +.endif + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif # exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kde4-runtime/files/plist.ldap b/x11/kde4-runtime/files/plist.ldap new file mode 100644 index 000000000000..082395fd0498 --- /dev/null +++ b/x11/kde4-runtime/files/plist.ldap @@ -0,0 +1,3 @@ +lib/kde3/kio_ldap.la +lib/kde3/kio_ldap.so +share/services/ldap.protocol diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 1ae4170f6ed5..e551153728dc 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src @@ -33,16 +33,19 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no -CONFIGURE_ARGS+=--disable-ltdl-install \ - --without-ldap \ - --disable-closure \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> +# This enables kio_ldap (needed by kaddresbook). +.if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so) +LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap21 +PLIST_APPEND+= plist.ldap +.endif + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif # exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kde4-workspace/files/plist.ldap b/x11/kde4-workspace/files/plist.ldap new file mode 100644 index 000000000000..082395fd0498 --- /dev/null +++ b/x11/kde4-workspace/files/plist.ldap @@ -0,0 +1,3 @@ +lib/kde3/kio_ldap.la +lib/kde3/kio_ldap.so +share/services/ldap.protocol diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 1ae4170f6ed5..e551153728dc 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src @@ -33,16 +33,19 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no -CONFIGURE_ARGS+=--disable-ltdl-install \ - --without-ldap \ - --disable-closure \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> +# This enables kio_ldap (needed by kaddresbook). +.if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so) +LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap21 +PLIST_APPEND+= plist.ldap +.endif + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif # exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kdebase3/files/plist.ldap b/x11/kdebase3/files/plist.ldap new file mode 100644 index 000000000000..082395fd0498 --- /dev/null +++ b/x11/kdebase3/files/plist.ldap @@ -0,0 +1,3 @@ +lib/kde3/kio_ldap.la +lib/kde3/kio_ldap.so +share/services/ldap.protocol diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 1ae4170f6ed5..e551153728dc 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src @@ -33,16 +33,19 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no -CONFIGURE_ARGS+=--disable-ltdl-install \ - --without-ldap \ - --disable-closure \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> +# This enables kio_ldap (needed by kaddresbook). +.if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so) +LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap21 +PLIST_APPEND+= plist.ldap +.endif + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif # exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kdebase4-runtime/files/plist.ldap b/x11/kdebase4-runtime/files/plist.ldap new file mode 100644 index 000000000000..082395fd0498 --- /dev/null +++ b/x11/kdebase4-runtime/files/plist.ldap @@ -0,0 +1,3 @@ +lib/kde3/kio_ldap.la +lib/kde3/kio_ldap.so +share/services/ldap.protocol diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 1ae4170f6ed5..e551153728dc 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src @@ -33,16 +33,19 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no -CONFIGURE_ARGS+=--disable-ltdl-install \ - --without-ldap \ - --disable-closure \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> +# This enables kio_ldap (needed by kaddresbook). +.if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so) +LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap21 +PLIST_APPEND+= plist.ldap +.endif + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif # exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kdebase4-workspace/files/plist.ldap b/x11/kdebase4-workspace/files/plist.ldap new file mode 100644 index 000000000000..082395fd0498 --- /dev/null +++ b/x11/kdebase4-workspace/files/plist.ldap @@ -0,0 +1,3 @@ +lib/kde3/kio_ldap.la +lib/kde3/kio_ldap.so +share/services/ldap.protocol diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 1ae4170f6ed5..e551153728dc 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src @@ -33,16 +33,19 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no -CONFIGURE_ARGS+=--disable-ltdl-install \ - --without-ldap \ - --disable-closure \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> +# This enables kio_ldap (needed by kaddresbook). +.if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so) +LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap21 +PLIST_APPEND+= plist.ldap +.endif + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif # exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kdebase4/files/plist.ldap b/x11/kdebase4/files/plist.ldap new file mode 100644 index 000000000000..082395fd0498 --- /dev/null +++ b/x11/kdebase4/files/plist.ldap @@ -0,0 +1,3 @@ +lib/kde3/kio_ldap.la +lib/kde3/kio_ldap.so +share/services/ldap.protocol |