Disable libmal support. AvantGo is dead.
This commit is contained in:
parent
a66745fa52
commit
9a98afe058
@ -1,4 +1,4 @@
|
|||||||
# $OpenBSD: Makefile,v 1.72 2012/06/15 08:30:23 ajacoutot Exp $
|
# $OpenBSD: Makefile,v 1.73 2012/09/02 15:53:32 ajacoutot Exp $
|
||||||
|
|
||||||
COMMENT = KDE personal information applications
|
COMMENT = KDE personal information applications
|
||||||
COMMENT-kpilot = KDE interface to sync with Palm Pilot
|
COMMENT-kpilot = KDE interface to sync with Palm Pilot
|
||||||
@ -61,8 +61,8 @@ MODULES = x11/kde devel/gettext
|
|||||||
|
|
||||||
LIB_DEPENDS += x11/kde/libs3
|
LIB_DEPENDS += x11/kde/libs3
|
||||||
|
|
||||||
REVISION = 10
|
REVISION = 11
|
||||||
REVISION-kpilot = 2
|
REVISION-kpilot = 3
|
||||||
|
|
||||||
WANTLIB += DCOP GL GLU ICE SM X11 Xcursor Xdamage Xext Xfixes
|
WANTLIB += DCOP GL GLU ICE SM X11 Xcursor Xdamage Xext Xfixes
|
||||||
WANTLIB += Xft Xi Xinerama Xmu Xpm Xrandr Xrender Xss Xt Xxf86vm
|
WANTLIB += Xft Xi Xinerama Xmu Xpm Xrandr Xrender Xss Xt Xxf86vm
|
||||||
@ -71,19 +71,18 @@ WANTLIB += c drm expat fontconfig freetype glib-2.0 gmodule-2.0
|
|||||||
WANTLIB += gnokii gpg-error gpgme gthread-2.0 ical idn jpeg kabc
|
WANTLIB += gnokii gpg-error gpgme gthread-2.0 ical idn jpeg kabc
|
||||||
WANTLIB += kabc_file kdecore kdefakes kdefx kdeprint kdesu kdeui
|
WANTLIB += kabc_file kdecore kdefakes kdefx kdeprint kdesu kdeui
|
||||||
WANTLIB += khtml kimproxy kio kjs kmedia2_idl knewstuff kparts
|
WANTLIB += khtml kimproxy kio kjs kmedia2_idl knewstuff kparts
|
||||||
WANTLIB += kresources kspell kutils kwalletclient lcms m mad mal
|
WANTLIB += kresources kspell kutils kwalletclient lcms m mad
|
||||||
WANTLIB += mcop mng ogg pcre pcreposix pisock png pthread qtmcop
|
WANTLIB += mcop mng ogg pcre pcreposix pisock png pthread qtmcop
|
||||||
WANTLIB += qui sasl2 sndio soundserver_idl stdc++ usb usb-1.0
|
WANTLIB += qui sasl2 sndio soundserver_idl stdc++ usb usb-1.0
|
||||||
WANTLIB += util vcard vorbis vorbisenc vorbisfile xcb z
|
WANTLIB += util vcard vorbis vorbisenc vorbisfile xcb z
|
||||||
|
|
||||||
FLAVORS = debug
|
FLAVORS = debug
|
||||||
LIB_DEPENDS += comms/pilot-link
|
|
||||||
RUN_DEPENDS += x11/kde/base3 \
|
RUN_DEPENDS += x11/kde/base3 \
|
||||||
devel/desktop-file-utils \
|
devel/desktop-file-utils \
|
||||||
x11/gtk+2,-guic
|
x11/gtk+2,-guic
|
||||||
LIB_DEPENDS += security/gpgme>=0.4.5 \
|
LIB_DEPENDS += security/gpgme>=0.4.5 \
|
||||||
security/cyrus-sasl2 \
|
security/cyrus-sasl2 \
|
||||||
comms/libmal \
|
comms/pilot-link \
|
||||||
comms/gnokii
|
comms/gnokii
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
$OpenBSD: patch-configure_in,v 1.6 2008/03/26 09:15:47 espie Exp $
|
$OpenBSD: patch-configure_in,v 1.7 2012/09/02 15:53:32 ajacoutot Exp $
|
||||||
--- configure.in.orig Wed Feb 13 16:18:12 2008
|
--- configure.in.orig Wed Feb 13 16:18:12 2008
|
||||||
+++ configure.in Tue Mar 25 22:27:11 2008
|
+++ configure.in Tue Mar 25 22:27:11 2008
|
||||||
@@ -402,29 +402,30 @@ if test -d "$with_opensync"; then
|
@@ -402,29 +402,30 @@ if test -d "$with_opensync"; then
|
||||||
@ -57,12 +57,3 @@ $OpenBSD: patch-configure_in,v 1.6 2008/03/26 09:15:47 espie Exp $
|
|||||||
)
|
)
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -899,7 +901,7 @@ if test "x$with_mal" = "xCHECK" ; then
|
|
||||||
mal_libdir)
|
|
||||||
if test -r $mal_libdir/libmal.$ext ; then
|
|
||||||
if test "x$mal_libdir" != "x/usr/lib$kdelibsuff" ; then
|
|
||||||
- MAL_LIB="-L$mal_libdir "
|
|
||||||
+ MAL_LIB="-pthread -L$mal_libdir "
|
|
||||||
test "$USE_RPATH" = yes && MAL_RPATH="-R $mal_libdir"
|
|
||||||
fi
|
|
||||||
MAL_LIB="${MAL_LIB}-lmal"
|
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
$OpenBSD: patch-kpilot_conduits_Makefile_in,v 1.4 2007/10/24 21:52:18 espie Exp $
|
|
||||||
--- kpilot/conduits/Makefile.in.orig Mon Oct 8 16:36:06 2007
|
|
||||||
+++ kpilot/conduits/Makefile.in Tue Oct 23 16:04:48 2007
|
|
||||||
@@ -372,6 +372,7 @@ xdg_directorydir = @xdg_directorydir@
|
|
||||||
xdg_menudir = @xdg_menudir@
|
|
||||||
@include_malconduit_FALSE@MAL_SUBDIR =
|
|
||||||
@include_malconduit_TRUE@MAL_SUBDIR = malconduit
|
|
||||||
+@include_malconduit_FALSE@MAL_SUBDIR =
|
|
||||||
SUBDIRS = \
|
|
||||||
abbrowserconduit \
|
|
||||||
docconduit \
|
|
||||||
@@ -382,7 +383,8 @@ SUBDIRS = \
|
|
||||||
popmail \
|
|
||||||
sysinfoconduit \
|
|
||||||
timeconduit \
|
|
||||||
- vcalconduit
|
|
||||||
+ vcalconduit \
|
|
||||||
+ ${MAL_SUBDIR}
|
|
||||||
|
|
||||||
#>- all: all-recursive
|
|
||||||
#>+ 1
|
|
@ -1,4 +1,4 @@
|
|||||||
@comment $OpenBSD: PLIST,v 1.36 2012/06/15 08:30:23 ajacoutot Exp $
|
@comment $OpenBSD: PLIST,v 1.37 2012/09/02 15:53:32 ajacoutot Exp $
|
||||||
@conflict kdelibs-<3.4
|
@conflict kdelibs-<3.4
|
||||||
@conflict kdebase-<3.4
|
@conflict kdebase-<3.4
|
||||||
@conflict kpilot-*
|
@conflict kpilot-*
|
||||||
@ -280,8 +280,6 @@ ${KDE}/conduit_doc.la
|
|||||||
${KDE}/conduit_doc.so
|
${KDE}/conduit_doc.so
|
||||||
${KDE}/conduit_knotes.la
|
${KDE}/conduit_knotes.la
|
||||||
${KDE}/conduit_knotes.so
|
${KDE}/conduit_knotes.so
|
||||||
${KDE}/conduit_mal.la
|
|
||||||
${KDE}/conduit_mal.so
|
|
||||||
${KDE}/conduit_memofile.la
|
${KDE}/conduit_memofile.la
|
||||||
${KDE}/conduit_memofile.so
|
${KDE}/conduit_memofile.so
|
||||||
${KDE}/conduit_notepad.la
|
${KDE}/conduit_notepad.la
|
||||||
@ -1756,7 +1754,6 @@ share/config.kcfg/korganizer.kcfg
|
|||||||
share/config.kcfg/kpalmdoc.kcfg
|
share/config.kcfg/kpalmdoc.kcfg
|
||||||
share/config.kcfg/kpilot.kcfg
|
share/config.kcfg/kpilot.kcfg
|
||||||
share/config.kcfg/kpilotlib.kcfg
|
share/config.kcfg/kpilotlib.kcfg
|
||||||
share/config.kcfg/malconduit.kcfg
|
|
||||||
share/config.kcfg/memofileconduit.kcfg
|
share/config.kcfg/memofileconduit.kcfg
|
||||||
share/config.kcfg/mk4config.kcfg
|
share/config.kcfg/mk4config.kcfg
|
||||||
share/config.kcfg/pimemoticons.kcfg
|
share/config.kcfg/pimemoticons.kcfg
|
||||||
@ -2379,7 +2376,6 @@ share/services/kresources/knotes/local.desktop
|
|||||||
share/services/kresources/knotes/scalix.desktop
|
share/services/kresources/knotes/scalix.desktop
|
||||||
share/services/kresources/knotes_manager.desktop
|
share/services/kresources/knotes_manager.desktop
|
||||||
share/services/ldifvcardthumbnail.desktop
|
share/services/ldifvcardthumbnail.desktop
|
||||||
share/services/mal_conduit.desktop
|
|
||||||
share/services/mbox.protocol
|
share/services/mbox.protocol
|
||||||
share/services/memofile-conduit.desktop
|
share/services/memofile-conduit.desktop
|
||||||
share/services/notepad-conduit.desktop
|
share/services/notepad-conduit.desktop
|
||||||
|
Loading…
Reference in New Issue
Block a user