Merge kde11-i18n into kde11, and remove my *-i18n ports.

There is no so-version bump, because of compatibility.

Approved by:	will (kde11 maintainer)

5 files changed, 46 insertions, 5 deletions

diff --git a/games/Makefile b/games/Makefile
index c39aabf398b1..a47b4c9ad61b 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -100,7 +100,6 @@
     SUBDIR += kbubbles
     SUBDIR += jzip
     SUBDIR += kdegames11
-    SUBDIR += kdegames11-i18n
     SUBDIR += kdegames2
     SUBDIR += klondike
     SUBDIR += krogue
diff --git a/games/kdegames11/Makefile b/games/kdegames11/Makefile
index 3eb27f2921bb..1bd33c610ed9 100644
--- a/games/kdegames11/Makefile
+++ b/games/kdegames11/Makefile
@@ -13,14 +13,15 @@ MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
 
 MAINTAINER=	will@FreeBSD.org
 
+BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.3:${PORTSDIR}/x11/kdelibs11 \
 		QwSpriteField.7:${PORTSDIR}/converters/kdesupport11
 
 USE_BZIP2=	yes
 USE_QT=		yes
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555"
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555"
 
 .include <bsd.port.mk>
diff --git a/games/kdegames11/files/patch-ba b/games/kdegames11/files/patch-ba
new file mode 100644
index 000000000000..bf88adfad1d4
--- /dev/null
+++ b/games/kdegames11/files/patch-ba
@@ -0,0 +1,30 @@
+--- ksame/Makefile.in.orig	Tue Aug 24 23:06:10 1999
++++ ksame/Makefile.in	Tue Aug 31 22:22:51 1999
+@@ -172,7 +172,7 @@
+ 
+ kde_icon_DATA = ksame.xpm
+ 
+-pics_DATA = stones.gif stones_mask.gif
++pics_DATA = stones.xpm stones_mask.xpm
+ apps_DATA = ksame.kdelnk
+ 
+ SUBDIRS = docs
+@@ -211,7 +211,7 @@
+ 
+ all: all-redirect
+ .SUFFIXES:
+-.SUFFIXES: .S .c .cpp .lo .o .s
++.SUFFIXES: .S .c .cpp .gif .lo .o .s .xpm
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+ 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps ksame/Makefile
+ 	cd $(top_srcdir) && perl admin/automoc ksame/Makefile.in
+@@ -563,6 +563,9 @@
+ 
+ messages:
+ 	$(XGETTEXT) -C -ktranslate -ki18n -x $(includedir)/kde.pot $(ksame_SOURCES) && mv messages.po ../po/ksame.pot
++
++.gif.xpm:
++	$(LOCALBASE)/bin/convert $< $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/games/kdegames11/files/patch-bb b/games/kdegames11/files/patch-bb
new file mode 100644
index 000000000000..476b1d07240f
--- /dev/null
+++ b/games/kdegames11/files/patch-bb
@@ -0,0 +1,11 @@
+--- ksame/StoneWidget.cpp.orig	Wed Feb 17 23:39:35 1999
++++ ksame/StoneWidget.cpp	Tue Aug 31 22:16:14 1999
+@@ -44,7 +44,7 @@
+ 	      stones[i]=F_CHANGED;
+ 
+ 	 if ( stonemap.isNull() )
+-	      stonemap = kapp->getIconLoader()->loadIcon("stones.gif");
++	      stonemap = kapp->getIconLoader()->loadIcon("stones.xpm");
+ 
+ 	 stone_px=stone_py=40;
+ 	 maxslices=30;
diff --git a/games/kdegames11/pkg-plist b/games/kdegames11/pkg-plist
index 725b5aeec535..149b4f69322e 100644
--- a/games/kdegames11/pkg-plist
+++ b/games/kdegames11/pkg-plist
@@ -485,8 +485,8 @@ share/apps/kreversi/pics/zoomout.xpm
 share/apps/kreversi/sounds/click.wav
 share/apps/kreversi/sounds/lost.wav
 share/apps/kreversi/sounds/won.wav
-share/apps/ksame/pics/stones.gif
-share/apps/ksame/pics/stones_mask.gif
+share/apps/ksame/pics/stones.xpm
+share/apps/ksame/pics/stones_mask.xpm
 share/apps/kshisen/pics/kshisen.xpm
 share/apps/kshisen/pics/kshisen_bgnd.xpm
 share/apps/ksmiletris/data/bg1.bmp