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

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

Approved by:	will (kde11 maintainer)

4 files changed, 46 insertions, 17 deletions

diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index 949dc2fa26c0..8a8d7ebcf56b 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -7,9 +7,14 @@
 
 PORTNAME=	qt
 PORTVERSION=	1.45
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 
+PATCH_SITES=	ftp://ftp.kde.gr.jp/pub/qt/patch/
+PATCHFILES=	qt-1.45-i18n-20000531.diff.gz
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	will@FreeBSD.org
 
 USE_GMAKE=	yes
@@ -24,8 +29,10 @@ VERSION=	${VER_MAJ}
 MAKE_ENV+=	VERSION="${VERSION}" VER_MIN=${VER_MIN} VER_MAJ=${VER_MAJ}
 PLIST_SUB+=	VERSION="${VER_MAJ}"
 
+.include <bsd.port.pre.mk>
+
 MAN1=	moc.1
-.include "${.CURDIR}/files/man3"
+.include "${FILESDIR}/man3"
 
 .if defined(WANT_STATIC)
 STATIC=		static
@@ -34,6 +41,11 @@ STATIC=		shared
 INSTALLS_SHLIB=	yes
 .endif
 
+post-patch:
+	@find ${WRKSRC}/src -name \*.h ! -name y.tab.h \
+		| ${SED} -e "s,${WRKSRC},..," \
+		| eval `${AWK} '{print "ln -sf",$$1,"${WRKSRC}/include"}'`
+
 post-configure:
 	@${PERL} -pi -e "s:g\+\+:${CXX}:g" ${WRKSRC}/configs/freebsd-g++-${STATIC}
 	@${PERL} -pi -e "s:/usr/X11R6:${PREFIX}:g" ${WRKSRC}/configs/freebsd-g++-${STATIC}
@@ -42,26 +54,27 @@ post-configure:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} freebsd-g++-${STATIC})
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/moc $(PREFIX)/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${PREFIX}/bin
 .if !defined(WANT_STATIC)
-	@${INSTALL_DATA} ${WRKSRC}/lib/libqt.so.${VERSION} $(PREFIX)/lib
-	@${LN} -sf $(PREFIX)/lib/libqt.so.$(VERSION) $(PREFIX)/lib/libqt.so
+	@${INSTALL_DATA} ${WRKSRC}/lib/libqt.so.${VERSION} ${PREFIX}/lib
+	@${LN} -sf ${PREFIX}/lib/libqt.so.${VERSION} ${PREFIX}/lib/libqt.so
 .else
-	@${INSTALL_DATA} ${WRKSRC}/lib/libqt.a $(PREFIX)/lib/libqt.a.$(VERSION)
-	@${LN} -sf $(PREFIX)/lib/libqt.a.$(VERSION) $(PREFIX)/lib/libqt.a
+	@${INSTALL_DATA} ${WRKSRC}/lib/libqt.a ${PREFIX}/lib/libqt.a.${VERSION}
+	@${LN} -sf ${PREFIX}/lib/libqt.a.${VERSION} ${PREFIX}/lib/libqt.a
 .endif
-	@${MKDIR} $(PREFIX)/include/X11/qt
-	@${INSTALL_DATA} ${WRKSRC}/include/* $(PREFIX)/include/X11/qt
-	@${INSTALL_MAN} ${WRKSRC}/man/man1/* $(PREFIX)/man/man1
-	@${INSTALL_MAN} ${WRKSRC}/man/man3/* $(PREFIX)/man/man3
+	@${MKDIR} ${PREFIX}/include/X11/qt
 	@${MKDIR} ${PREFIX}/share/doc/qt/html
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/qt
-	@${INSTALL_DATA} ${WRKSRC}/README.QT ${PREFIX}/share/doc/qt
-	@${INSTALL_DATA} ${WRKSRC}/html/* ${PREFIX}/share/doc/qt/html
+	@(cd ${WRKSRC} ; \
+	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/X11/qt ; \
+	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/man/man1 ; \
+	${INSTALL_MAN} ${WRKSRC}/man/man3/* ${PREFIX}/man/man3 ; \
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/qt ; \
+	${INSTALL_DATA} ${WRKSRC}/README.QT ${PREFIX}/share/doc/qt ; \
+	${INSTALL_DATA} ${WRKSRC}/html/* ${PREFIX}/share/doc/qt/html )
 
 .if defined(WANT_STATIC)
 post-install:
 	@${PERL} -pi -e 's/libqt\.so/libqt.a/' ${TMPPLIST}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt145/distinfo b/x11-toolkits/qt145/distinfo
index f224fe70179d..05a1503cead0 100644
--- a/x11-toolkits/qt145/distinfo
+++ b/x11-toolkits/qt145/distinfo
@@ -1 +1,2 @@
 MD5 (qt-1.45.tar.gz) = 0602a23f58e436dda670ae50e37c9765
+MD5 (qt-1.45-i18n-20000531.diff.gz) = 120b94e683e7054fadc5541b517361cc
diff --git a/x11-toolkits/qt145/files/patch-aa b/x11-toolkits/qt145/files/patch-aa
index c8e6ab59581f..c09663b2a880 100644
--- a/x11-toolkits/qt145/files/patch-aa
+++ b/x11-toolkits/qt145/files/patch-aa
@@ -1,12 +1,12 @@
---- configs/freebsd-g++-shared	Fri Feb 26 12:01:59 1999
-+++ configs/freebsd-g++-shared.new	Sun Jan  2 17:11:37 2000
+--- configs/freebsd-g++-shared.orig	Tue Oct 10 00:37:00 2000
++++ configs/freebsd-g++-shared	Tue Oct 10 00:37:24 2000
 @@ -25,7 +25,7 @@
  
  # Linking applications
  SYSCONF_LINK		= g++
 -SYSCONF_LFLAGS		= 
 +SYSCONF_LFLAGS		= %%CXXFLAGS%%
- SYSCONF_LIBS		= 
+ SYSCONF_LIBS		= -lxpg4
  
  # Link flags shared objects
 @@ -40,15 +40,13 @@
diff --git a/x11-toolkits/qt145/files/patch-ad b/x11-toolkits/qt145/files/patch-ad
new file mode 100644
index 000000000000..f74bb55cfde0
--- /dev/null
+++ b/x11-toolkits/qt145/files/patch-ad
@@ -0,0 +1,15 @@
+--- src/kernel/qapplication_x11.cpp.orig	Thu Mar 23 21:51:42 2000
++++ src/kernel/qapplication_x11.cpp	Thu Mar 23 21:57:48 2000
+@@ -108,6 +108,12 @@
+ #undef select
+ extern "C" int select( int, void *, void *, void *, struct timeval * );
+ 
++extern "C" char *XSetIMValues(
++#if NeedVarargsPrototypes
++    XIM /* im */, ...
++#endif
++);
++
+ #if defined(_OS_AIX_)
+ // for FD_ZERO
+ static inline void bzero( void *s, int n )