Upgrade to 2.2.1.

Submitted by:		SASAKI Katuhiro <sahiro@crest.ocn.ne.jp>
(with slight modifications)

5 files changed, 75 insertions, 8 deletions

diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index 0b0651ee9af8..26fe58557c84 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdeaddons
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -21,4 +21,23 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 PLIST_SUB+=	RM=${RM}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/include/SDL11/SDL.h)
+WITH_SDL=	yes
+.endif
+
+.if defined(WITH_SDL) && ${WITH_SDL} == yes
+LIB_DEPENDS+=	SDL-1.1.3:${PORTSDIR}/devel/sdl12
+CONFIGURE_ENV+=	SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
+PLIST_SUB+=	SDL=""
+.else
+PLIST_SUB+=	SDL="@comment "
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you want to compile with SDL support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_SDL=yes\""
+	@${ECHO_MSG}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/misc/kdeaddons3/distinfo b/misc/kdeaddons3/distinfo
index da531557dcc0..54bc41edca3c 100644
--- a/misc/kdeaddons3/distinfo
+++ b/misc/kdeaddons3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeaddons-2.2.tar.bz2) = 3c3d40e8d3e8de02ced840ccf7944790
+MD5 (KDE/kdeaddons-2.2.1.tar.bz2) = 034f35ed3cd575b65f8ccc6110590d20
diff --git a/misc/kdeaddons3/files/patch-noatun-plugins::blurscope::Makefile.in b/misc/kdeaddons3/files/patch-noatun-plugins::blurscope::Makefile.in
new file mode 100644
index 000000000000..d7a2b36e86f4
--- /dev/null
+++ b/misc/kdeaddons3/files/patch-noatun-plugins::blurscope::Makefile.in
@@ -0,0 +1,16 @@
+--- noatun-plugins/blurscope/Makefile.in.orig	Sat Sep  8 09:52:51 2001
++++ noatun-plugins/blurscope/Makefile.in	Wed Oct 24 23:03:09 2001
+@@ -215,11 +215,11 @@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ 
+-INCLUDES = -I$(kde_includes)/noatun  `sdl-config --cflags` $(all_includes)
++INCLUDES = -I$(kde_includes)/noatun  `$(SDL_CONFIG) --cflags` $(all_includes)
+ 
+ lib_LTLIBRARIES = libnoatunblurscope.la
+ libnoatunblurscope_la_SOURCES = sdlscope.cpp scopedisplayer.cpp
+-libnoatunblurscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined `sdl-config --libs`
++libnoatunblurscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined `$(SDL_CONFIG) --libs`
+ libnoatunblurscope_la_LIBADD = $(LIB_KFILE) -lnoatun -lm
+ #>- libnoatunblurscope_la_METASOURCES = AUTO
+ 
diff --git a/misc/kdeaddons3/files/patch-noatun-plugins::noatunmadness::Makefile.in b/misc/kdeaddons3/files/patch-noatun-plugins::noatunmadness::Makefile.in
new file mode 100644
index 000000000000..e32afb46449e
--- /dev/null
+++ b/misc/kdeaddons3/files/patch-noatun-plugins::noatunmadness::Makefile.in
@@ -0,0 +1,16 @@
+--- noatun-plugins/noatunmadness/Makefile.in.orig	Sat Sep  8 09:52:51 2001
++++ noatun-plugins/noatunmadness/Makefile.in	Wed Oct 24 23:06:44 2001
+@@ -215,11 +215,11 @@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ 
+-INCLUDES = -I$(kde_includes)/noatun  `sdl-config --cflags` $(all_includes)
++INCLUDES = -I$(kde_includes)/noatun  `$(SDL_CONFIG) --cflags` $(all_includes)
+ 
+ lib_LTLIBRARIES = libnoatunmadness.la
+ libnoatunmadness_la_SOURCES = madness.cpp
+-libnoatunmadness_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined `sdl-config --libs`
++libnoatunmadness_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined `$(SDL_CONFIG) --libs`
+ libnoatunmadness_la_LIBADD = $(LIB_KFILE) -lnoatun -lm
+ #>- libnoatunmadness_la_METASOURCES = AUTO
+ 
diff --git a/misc/kdeaddons3/pkg-plist b/misc/kdeaddons3/pkg-plist
index 6e716dfb6d79..3eca8d5c45a4 100644
--- a/misc/kdeaddons3/pkg-plist
+++ b/misc/kdeaddons3/pkg-plist
@@ -3,6 +3,9 @@
 @unexec %%RM%% -f %D/share/doc/HTML/en/kate-plugins/common
 @unexec %%RM%% -f %D/share/doc/HTML/en/kicker-applets/common
 bin/dcop_kate
+%%SDL%%bin/noatunsynaescope.bin
+%%SDL%%bin/noatuntippecanoe.bin
+%%SDL%%bin/noatuntyler.bin
 bin/testor
 lib/kde2/libbabelfishplugin.la
 lib/kde2/libbabelfishplugin.so
@@ -38,22 +41,30 @@ lib/libkolourpicker.so.1
 lib/libktimemon.la
 lib/libktimemon.so
 lib/libktimemon.so.1
+%%SDL%%lib/libnoatunblurscope.la
+%%SDL%%lib/libnoatunblurscope.so
 lib/libnoatunluckytag.la
 lib/libnoatunluckytag.so
 lib/libnoatunmadness.la
 lib/libnoatunmadness.so
+%%SDL%%lib/libnoatunsynaescope.la
+%%SDL%%lib/libnoatunsynaescope.so
+%%SDL%%lib/libnoatuntippecanoe.la
+%%SDL%%lib/libnoatuntippecanoe.so
+%%SDL%%lib/libnoatuntyler.la
+%%SDL%%lib/libnoatuntyler.so
 lib/libnoatunwakeup.la
 lib/libnoatunwakeup.so
-share/apps/kate/plugins/katehtmltools.desktop
 share/apps/kate/plugins/katehtmltools/ui.rc
-share/apps/kate/plugins/kateinsertcommand.desktop
+share/apps/kate/plugins/katehtmltools.desktop
 share/apps/kate/plugins/kateinsertcommand/ui.rc
-share/apps/kate/plugins/kateopenheader.desktop
+share/apps/kate/plugins/kateinsertcommand.desktop
 share/apps/kate/plugins/kateopenheader/ui.rc
-share/apps/kate/plugins/kateprojectmanager.desktop
+share/apps/kate/plugins/kateopenheader.desktop
 share/apps/kate/plugins/kateprojectmanager/ui.rc
-share/apps/kate/plugins/katetextfilter.desktop
+share/apps/kate/plugins/kateprojectmanager.desktop
 share/apps/kate/plugins/katetextfilter/ui.rc
+share/apps/kate/plugins/katetextfilter.desktop
 share/apps/khtml/kpartplugins/khtmlsettingsplugin.rc
 share/apps/khtml/kpartplugins/plugin_babelfish.rc
 share/apps/khtml/kpartplugins/plugin_domtreeviewer.rc
@@ -73,8 +84,13 @@ share/apps/konqiconview/kpartplugins/dirfilterplugin.rc
 share/apps/konqiconview/kpartplugins/kimgalleryplugin.rc
 share/apps/konqlistview/kpartplugins/dirfilterplugin.rc
 share/apps/konqlistview/kpartplugins/kimgalleryplugin.rc
+%%SDL%%share/apps/noatun/blurscope.plugin
 share/apps/noatun/luckytag.plugin
 share/apps/noatun/madness.plugin
+%%SDL%%share/apps/noatun/synaescope.plugin
+%%SDL%%share/apps/noatun/tippecanoe.plugin
+%%SDL%%share/apps/noatun/tyler.plugin
+%%SDL%%share/apps/noatun/tylerstates
 share/apps/noatun/wakeup.plugin
 share/doc/HTML/en/kate-plugins/common
 share/doc/HTML/en/kate-plugins/helloworld.docbook