diff options
| author | imura <imura@FreeBSD.org> | 2000-10-23 23:24:23 +0800 |
|---|---|---|
| committer | imura <imura@FreeBSD.org> | 2000-10-23 23:24:23 +0800 |
| commit | 763172dd40a97e7cefe5d1715beb1a32859bd9a1 (patch) | |
| tree | 68db937ed77b0b39b99f9798f31633b4da382b37 | |
| parent | 9af3c664651dac85d63aae140e9e1da5d00bed87 (diff) | |
| download | freebsd-ports-gnome-763172dd40a97e7cefe5d1715beb1a32859bd9a1.tar.gz freebsd-ports-gnome-763172dd40a97e7cefe5d1715beb1a32859bd9a1.tar.zst freebsd-ports-gnome-763172dd40a97e7cefe5d1715beb1a32859bd9a1.zip | |
Merge kde11-i18n into kde11, and remove my *-i18n ports.
There is no so-version bump, because of compatibility.
Approved by: will (kde11 maintainer)
47 files changed, 599 insertions, 171 deletions
diff --git a/audio/Makefile b/audio/Makefile index 9d36ed969e2c..28506cf28fb4 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -65,7 +65,6 @@ SUBDIR += id3ren SUBDIR += juke SUBDIR += kdemultimedia11 - SUBDIR += kdemultimedia11-i18n SUBDIR += kdemultimedia2 SUBDIR += kmikmod SUBDIR += kmp3 diff --git a/audio/kdemultimedia11/files/patch-ba b/audio/kdemultimedia11/files/patch-ba new file mode 100644 index 000000000000..084b772d0b08 --- /dev/null +++ b/audio/kdemultimedia11/files/patch-ba @@ -0,0 +1,20 @@ +--- kscd/Makefile.in.orig Wed Sep 8 00:23:41 1999 ++++ kscd/Makefile.in Fri Mar 10 01:01:13 2000 +@@ -468,7 +468,7 @@ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- chmod 777 $(distdir)/$$subdir; \ ++ chmod 1777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ +@@ -563,7 +563,7 @@ + for i in $(CDDB_DIRS); do \ + if test ! -d $(CDDBDIR)/$$i; then \ + $(mkinstalldirs) $(CDDBDIR)/$$i ;\ +- chmod 0777 $(CDDBDIR)/$$i ;\ ++ chmod 1777 $(CDDBDIR)/$$i ;\ + fi ;\ + done + $(mkinstalldirs) $(kde_icondir) diff --git a/audio/kdemultimedia11/pkg-plist b/audio/kdemultimedia11/pkg-plist index 34fd257b8340..5b53b6b406d2 100644 --- a/audio/kdemultimedia11/pkg-plist +++ b/audio/kdemultimedia11/pkg-plist @@ -77,6 +77,19 @@ share/apps/kmix/pics/mix_unknown.xpm share/apps/kmix/pics/mix_volume.xpm share/apps/kscd/pics/cdsmall.xpm share/apps/kscd/pics/kscdlogo.xpm +@exec /bin/mkdir -p %D/share/apps/kscd/cddb +@exec /bin/mkdir -p %D/share/apps/kscd/cddb/blues +@exec /bin/mkdir -p %D/share/apps/kscd/cddb/classical +@exec /bin/mkdir -p %D/share/apps/kscd/cddb/country +@exec /bin/mkdir -p %D/share/apps/kscd/cddb/data +@exec /bin/mkdir -p %D/share/apps/kscd/cddb/folk +@exec /bin/mkdir -p %D/share/apps/kscd/cddb/jazz +@exec /bin/mkdir -p %D/share/apps/kscd/cddb/misc +@exec /bin/mkdir -p %D/share/apps/kscd/cddb/newage +@exec /bin/mkdir -p %D/share/apps/kscd/cddb/reggae +@exec /bin/mkdir -p %D/share/apps/kscd/cddb/rock +@exec /bin/mkdir -p %D/share/apps/kscd/cddb/soundtrack +@exec /bin/chmod 1777 %D/share/apps/kscd/cddb/* share/doc/HTML/de/kmidi/kmidi-1.html share/doc/HTML/de/kmidi/kmidi-2.html share/doc/HTML/de/kmidi/kmidi-3.html diff --git a/converters/Makefile b/converters/Makefile index 92102f1dd70a..fbcd914c9e2b 100644 --- a/converters/Makefile +++ b/converters/Makefile @@ -11,7 +11,6 @@ SUBDIR += iconv-rfc1345 SUBDIR += ish SUBDIR += kdesupport11 - SUBDIR += kdesupport11-i18n SUBDIR += kdesupport2 SUBDIR += libiconv SUBDIR += libutf-8 diff --git a/converters/kdesupport11/Makefile b/converters/kdesupport11/Makefile index 9b9e51ccfbc4..cc35f3b09fd4 100644 --- a/converters/kdesupport11/Makefile +++ b/converters/kdesupport11/Makefile @@ -6,7 +6,8 @@ # PORTNAME= kdesupport -PORTVERSION= 1.1.2.1 +PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= converters kde MASTER_SITES= $(MASTER_SITE_KDE) MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2 diff --git a/deskutils/Makefile b/deskutils/Makefile index 707504100b86..9484457fbec0 100644 --- a/deskutils/Makefile +++ b/deskutils/Makefile @@ -16,7 +16,6 @@ SUBDIR += gtimer SUBDIR += ical SUBDIR += korganizer - SUBDIR += korganizer11-i18n SUBDIR += kproject SUBDIR += moneydance SUBDIR += notebook diff --git a/devel/Makefile b/devel/Makefile index a0a06f90baff..5bfdaa75c89a 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -24,7 +24,6 @@ SUBDIR += bonobo SUBDIR += bugbuddy SUBDIR += c_c++_reference - SUBDIR += c_c++_reference-i18n SUBDIR += camlp4 SUBDIR += cbrowser SUBDIR += cc65 @@ -113,11 +112,8 @@ SUBDIR += imake-4 SUBDIR += jam SUBDIR += kdbg - SUBDIR += kdbg-i18n SUBDIR += kdelibdocs - SUBDIR += kdelibdocs-i18n SUBDIR += kdevelop - SUBDIR += kdevelop-i18n SUBDIR += kpp SUBDIR += ktranslator SUBDIR += lclint 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 diff --git a/graphics/Makefile b/graphics/Makefile index 77df82d9fd2c..f929ec94e0aa 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -87,7 +87,6 @@ SUBDIR += juno-2 SUBDIR += kdc2tiff SUBDIR += kdegraphics11 - SUBDIR += kdegraphics11-i18n SUBDIR += kdegraphics2 SUBDIR += killustrator SUBDIR += kplot3d diff --git a/japanese/kebook/Makefile b/japanese/kebook/Makefile index c7bb61dab7a0..92714a52cf56 100644 --- a/japanese/kebook/Makefile +++ b/japanese/kebook/Makefile @@ -14,16 +14,16 @@ PKGNAMESUFFIX= -i18n MAINTAINER= hige@higesoft.os.rim.or.jp -LIB_DEPENDS= qti18n.3:${PORTSDIR}/x11-toolkits/qt-i18n \ - kdecore.2:${PORTSDIR}/x11/kdelibs11-i18n \ - kfm.2:${PORTSDIR}/x11/kdebase11-i18n \ +LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ eb.3:${PORTSDIR}/japanese/eb BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext +RUN_DEPENDS= kfm:${PORTSDIR}/x11/kdebase11 USE_BZIP2= yes USE_GMAKE= yes USE_NEWGCC= yes USE_LIBTOOL= yes +USE_QT= yes CONFIGURE_ARGS= "--with-qt-dir=${QTDIR}" \ "--with-qt-includes=${QTDIR}/include/X11/qt" \ diff --git a/misc/Makefile b/misc/Makefile index 8b3ad6a37c31..e3afba0bfbdd 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -75,7 +75,6 @@ SUBDIR += jive SUBDIR += kcd SUBDIR += kdeutils11 - SUBDIR += kdeutils11-i18n SUBDIR += kdeutils2 SUBDIR += kdirstat SUBDIR += kp diff --git a/misc/kdeutils11/Makefile b/misc/kdeutils11/Makefile index 54c8463eb4ed..956b1bb13870 100644 --- a/misc/kdeutils11/Makefile +++ b/misc/kdeutils11/Makefile @@ -7,10 +7,15 @@ PORTNAME= kdeutils PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= $(MASTER_SITE_KDE) MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2 +PATCH_SITES= http://www.kde.gr.jp/~asaki/KDE-1.1.2/SOURCES/ +PATCHFILES= kdeutils-ja.19991117.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= will@FreeBSD.org LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 diff --git a/misc/kdeutils11/distinfo b/misc/kdeutils11/distinfo index 04d85c93b414..9e88f366fba9 100644 --- a/misc/kdeutils11/distinfo +++ b/misc/kdeutils11/distinfo @@ -1 +1,2 @@ MD5 (kdeutils-1.1.2.tar.bz2) = 43ca9fcd2c9f3842201f4d5848cd32d9 +MD5 (kdeutils-ja.19991117.diff.gz) = d952e8348efe986540166a2e79f3a337 diff --git a/misc/kdeutils11/pkg-plist b/misc/kdeutils11/pkg-plist index 140c07597822..fd1a00cbd533 100644 --- a/misc/kdeutils11/pkg-plist +++ b/misc/kdeutils11/pkg-plist @@ -574,5 +574,3 @@ share/toolbar/filedel.xpm @dirrm share/apps/kedit @dirrm share/apps/kcalc/pics @dirrm share/apps/kcalc -@dirrm share/apps/kab/pics -@dirrm share/apps/kab diff --git a/net/Makefile b/net/Makefile index a1b5b632b08a..102247a757b6 100644 --- a/net/Makefile +++ b/net/Makefile @@ -109,7 +109,6 @@ SUBDIR += jabber-transport SUBDIR += jwhois SUBDIR += kdenetwork11 - SUBDIR += kdenetwork11-i18n SUBDIR += kdenetwork2 SUBDIR += kdetelnet SUBDIR += kicq diff --git a/net/kdenetwork11/Makefile b/net/kdenetwork11/Makefile index 06fefdff36e0..f263b560cd91 100644 --- a/net/kdenetwork11/Makefile +++ b/net/kdenetwork11/Makefile @@ -7,13 +7,21 @@ PORTNAME= kdenetwork PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= net news kde MASTER_SITES= $(MASTER_SITE_KDE) MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2 +PATCH_SITES= http://www.kde.gr.jp/~toyohiro/ \ + http://www.kde.gr.jp/~imura/ko/ +PATCHFILES= kdenetwork-1.1.2-ja-19991124.diff.gz \ + kdenetwork-1.1.2-ko-20000108.diff +PATCH_DIST_STRIP= -p1 + MAINTAINER= will@FreeBSD.org -BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm +BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm \ + msgfmt:${PORTSDIR}/devel/gettext LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib \ kdecore.3:${PORTSDIR}/x11/kdelibs11 \ QwSpriteField.7:${PORTSDIR}/converters/kdesupport11 diff --git a/net/kdenetwork11/distinfo b/net/kdenetwork11/distinfo index 9a6646b5d525..7e1f08729760 100644 --- a/net/kdenetwork11/distinfo +++ b/net/kdenetwork11/distinfo @@ -1 +1,3 @@ MD5 (kdenetwork-1.1.2.tar.bz2) = ce8ce348a7b56769665afe58e36902ff +MD5 (kdenetwork-1.1.2-ja-19991124.diff.gz) = 1f4b42d14aeabc217bfa8a037449f1dc +MD5 (kdenetwork-1.1.2-ko-20000108.diff) = 83900d88154738ee0cbd36f2bd4fd3fb diff --git a/net/kdenetwork11/files/patch-ba b/net/kdenetwork11/files/patch-ba new file mode 100644 index 000000000000..e5bba9bfea77 --- /dev/null +++ b/net/kdenetwork11/files/patch-ba @@ -0,0 +1,11 @@ +--- kppp/Rules/Japan/NTT_Local.rst.orig Sun Feb 8 03:18:47 1998 ++++ kppp/Rules/Japan/NTT_Local.rst Fri May 14 01:14:20 1999 +@@ -17,7 +17,7 @@ + ################################################################ + + # defines JPY (Japanese Yen) to be used as currency +-currency_symbol=JPY ++currency_symbol=±ß + + # Define the position of the currency symbol. + currency_position=right diff --git a/net/kdenetwork11/files/patch-bb b/net/kdenetwork11/files/patch-bb new file mode 100644 index 000000000000..d5a6187a21b3 --- /dev/null +++ b/net/kdenetwork11/files/patch-bb @@ -0,0 +1,11 @@ +--- krn/Makefile.in.orig Thu May 13 23:45:31 1999 ++++ krn/Makefile.in Thu May 13 23:45:46 1999 +@@ -329,7 +329,7 @@ + PROGRAMS = $(bin_PROGRAMS) + + +-DEFS = @DEFS@ -I. -I$(srcdir) -I.. ++DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I../kmail + CPPFLAGS = @CPPFLAGS@ + LIBS = @LIBS@ + krn_OBJECTS = main.o NNTP.o groupdlg.o artdlg.o newsgroup.o asker.o \ diff --git a/net/kdenetwork11/files/patch-bc b/net/kdenetwork11/files/patch-bc new file mode 100644 index 000000000000..2c3d94a0dbe7 --- /dev/null +++ b/net/kdenetwork11/files/patch-bc @@ -0,0 +1,14 @@ +*** karchie/KAView.cpp.orig Wed Apr 14 21:22:18 1999 +--- karchie/KAView.cpp Sun Sep 12 19:16:36 1999 +*************** +*** 457,462 **** +--- 457,465 ---- + // setup list + list = new KAViewList( this, "viewlist" ); + ++ filetype = NULL; ++ box = NULL; ++ + // setup fileview + // config = KApplication::getKApplication()->getConfig(); + slotShowFileDiscriptor(KApplication::getKApplication() diff --git a/net/kdenetwork11/pkg-plist b/net/kdenetwork11/pkg-plist index 5e39f2480318..a9a796f16faa 100644 --- a/net/kdenetwork11/pkg-plist +++ b/net/kdenetwork11/pkg-plist @@ -768,6 +768,8 @@ share/toolbar/mini-ktalk.xpm @exec ln -sf libpbutton.so.0 %D/lib/ksirc/libpbutton.so @exec ln -sf libpalistbox.so.0 %D/lib/ksirc/libpalistbox.so @exec ln -sf libksirclistbox.so.0 %D/lib/ksirc/libksirclistbox.so +@exec ln -sf kppp.html %D/share/doc/HTML/en/kppp/index.html +@unexec rm -f %D/share/doc/HTML/en/kppp/index.html @dirrm share/doc/HTML/it/ktalkd @dirrm share/doc/HTML/fr/ktalkd @dirrm share/doc/HTML/en/pws @@ -831,6 +833,7 @@ share/toolbar/mini-ktalk.xpm @dirrm share/apps/kmail @dirrm share/apps/kbiff/pics @dirrm share/apps/kbiff +@dirrm share/applnk/Settings/Network @unexec rm -f %D/lib/ksirc/libksirclistbox.so @unexec rm -f %D/lib/ksirc/libpalistbox.so @unexec rm -f %D/lib/ksirc/libpbutton.so @@ -848,5 +851,3 @@ share/toolbar/mini-ktalk.xpm @unexec rm -f %D/lib/ksirc/libptablevw.so @dirrm lib/ksirc @unexec rm -f %D/lib/libpuke.so -@exec ln -sf kppp.html %D/share/doc/HTML/en/kppp/index.html -@unexec rm -f %D/share/doc/HTML/en/kppp/index.html diff --git a/x11-clocks/kdetoys11/Makefile b/x11-clocks/kdetoys11/Makefile index fe3f229dac05..8dd7d828988a 100644 --- a/x11-clocks/kdetoys11/Makefile +++ b/x11-clocks/kdetoys11/Makefile @@ -5,14 +5,31 @@ # $FreeBSD$ # -MASTERDIR= ${.CURDIR}/../../audio/kdemultimedia11-i18n PORTNAME= kdetoys +PORTVERSION= 1.1.2 CATEGORIES= x11-clocks kde +MASTER_SITES= $(MASTER_SITE_KDE) +MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/source/bz2 MAINTAINER= imura@FreeBSD.org BUILD_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick +LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 -.include "${MASTERDIR}/Makefile" +USE_BZIP2= yes +USE_GMAKE= yes +USE_NEWGCC= yes +USE_LIBTOOL= yes +CONFIGURE_ARGS= "--with-qt-includes=${QTDIR}/include/X11/qt" \ + "--with-extra-includes=${LOCALBASE}/include" \ + "--with-extra-libs=${LOCALBASE}/lib" +CONFIGURE_ENV= QTDIR=${QTDIR} \ + DO_NOT_COMPILE=mouse -CONFIGURE_ENV+= DO_NOT_COMPILE=mouse +.if defined(PREFIX) +QTDIR?= ${PREFIX} +.else +QTDIR?= ${X11BASE} +.endif + +.include <bsd.port.mk> diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index a265adf813d6..5c0ae13b1b7a 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -61,7 +61,6 @@ SUBDIR += py-qt SUBDIR += py-tkinter SUBDIR += py-wxPython - SUBDIR += qt-i18n SUBDIR += qt145 SUBDIR += qt22 SUBDIR += rep-gtk 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 ) diff --git a/x11/Makefile b/x11/Makefile index 36816ec74712..4ef0df81b7ad 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -40,13 +40,10 @@ SUBDIR += imwheel SUBDIR += kb2mb2 SUBDIR += kde11 - SUBDIR += kde11-i18n SUBDIR += kde2 SUBDIR += kdebase11 - SUBDIR += kdebase11-i18n SUBDIR += kdebase2 SUBDIR += kdelibs11 - SUBDIR += kdelibs11-i18n SUBDIR += kdelibs2 SUBDIR += kvidtune SUBDIR += kworldwatch diff --git a/x11/kde11/Makefile b/x11/kde11/Makefile index fa944d65d7d2..71464828c3eb 100644 --- a/x11/kde11/Makefile +++ b/x11/kde11/Makefile @@ -20,7 +20,8 @@ RUN_DEPENDS= kwm:${PORTSDIR}/x11/kdebase11 \ kmahjongg:${PORTSDIR}/games/kdegames11 \ kghostview:${PORTSDIR}/graphics/kdegraphics11 \ kmail:${PORTSDIR}/net/kdenetwork11 \ - kmedia:${PORTSDIR}/audio/kdemultimedia11 + kmedia:${PORTSDIR}/audio/kdemultimedia11 \ + kworldwatch:${PORTSDIR}/x11-clocks/kdetoys11-i18n NO_BUILD= yes diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile index 9864f8a8794f..9720f2fd4906 100644 --- a/x11/kdebase11/Makefile +++ b/x11/kdebase11/Makefile @@ -7,12 +7,18 @@ PORTNAME= kdebase PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= $(MASTER_SITE_KDE) MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2 +PATCH_SITES= ftp://ftp.kde.gr.jp/pub/kde/stable/latest/distribution/tar/generic/jp-patch/ +PATCHFILES= kdebase-ja.19990823.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= will@FreeBSD.org +BUILD_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ intl.1:${PORTSDIR}/devel/gettext @@ -20,15 +26,20 @@ USE_XLIB= yes USE_XPM= yes USE_BZIP2= yes USE_QT= yes +USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xdmdir=${X11BASE}/lib/X11/xdm CONFIGURE_ENV= CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \ - INSTALL_SCRIPT="install -c -m 555" PATH="${PATH}:${X11BASE}/bin" -USE_GMAKE= yes + INSTALL_SCRIPT="install -c -m 555" PATH="${PATH}:${X11BASE}/bin" \ + RUN_KAPPFINDER="no" MAKE_ENV= RM=${RM} CFLAGS+= "-I$(PREFIX)/include" +pre-patch: + @${CP} ${FILESDIR}/ja.kimap ${WRKSRC}/kikbd/maps + post-install: + ${INSTALL_DATA} ${FILESDIR}/kwmrc ${PREFIX}/share/config @${ECHO} @${ECHO_MSG} "Due to the potential security hole represented by the KDE" @${ECHO_MSG} "screensavers, you will have to set them setuid yourself." diff --git a/x11/kdebase11/distinfo b/x11/kdebase11/distinfo index 3b5e9ff7e1a1..8b0a9ea1dbf3 100644 --- a/x11/kdebase11/distinfo +++ b/x11/kdebase11/distinfo @@ -1 +1,2 @@ MD5 (kdebase-1.1.2.tar.bz2) = 330492b058e8087fca7f1ce350363254 +MD5 (kdebase-ja.19990823.diff.gz) = 84bfd3b7f860dd3b8b8a985ee2add887 diff --git a/x11/kdebase11/files/ja.kimap b/x11/kdebase11/files/ja.kimap new file mode 100644 index 000000000000..629d6a92428d --- /dev/null +++ b/x11/kdebase11/files/ja.kimap @@ -0,0 +1,114 @@ +# KDE Config File + +[International Keyboard] +Authors=Kazuhide Takahashi <kazu@dgra.ne.jp> + +Language=Japanese +Language[ja]=ÆüËܸì + +Label=Ja +Locale=ja + +[KeyboardMap] +keycode1=9,Escape,, +keycode2=10,1,exclam, + keycode3=11,2,quotedbl, +keycode4=12,3,numbersign, +keycode5=13,4,dollar, + keycode6=14,5,percent, + keycode7=15,6,ampersand, + keycode8=16,7,apostrophe, + keycode9=17,8,parenleft, + keycode10=18,9,parenright, + keycode11=19,0,, + keycode12=20,minus,equal, + keycode13=21,asciicircum,asciitilde, +keycode14=22,BackSpace,, +keycode15=23,Tab,ISO_Left_Tab, +keycode16=24,q,Q, +keycode17=25,w,W, +keycode18=26,e,E, +keycode19=27,r,R, +keycode20=28,t,T, +keycode21=29,y,Y, +keycode22=30,u,U, +keycode23=31,i,I, +keycode24=32,o,O, +keycode25=33,p,P, + keycode26=34,at,grave, + keycode27=35,bracketleft,braceleft, +keycode28=36,Return,, +keycode29=37,Control_L,, +keycode30=38,a,A, +keycode31=39,s,S, +keycode32=40,d,D, +keycode33=41,f,F, +keycode34=42,g,G, +keycode35=43,h,H, +keycode36=44,j,J, +keycode37=45,k,K, +keycode38=46,l,L, + keycode39=47,semicolon,plus + keycode40=48,colon,asterisk, +keycode41=49,grave,asciitilde, +keycode42=50,Shift_L,, + keycode43=51,bracketright,braceright, +keycode44=52,z,Z, +keycode45=53,x,X, +keycode46=54,c,C, +keycode47=55,v,V, +keycode48=56,b,B, +keycode49=57,n,N, +keycode50=58,m,M, +keycode51=59,comma,less, +keycode52=60,period,greater, +keycode53=61,slash,question, +keycode54=62,Shift_R,, +keycode55=63,KP_Multiply,, +keycode56=64,Alt_L,Meta_L, +keycode57=65,space,, +keycode58=66,Caps_Lock,, +keycode59=67,F1,, +keycode60=68,F2,, +keycode61=69,F3,, +keycode62=70,F4,, +keycode63=71,F5,, +keycode64=72,F6,, +keycode65=73,F7,, +keycode66=74,F8,, +keycode67=75,F9,, +keycode68=76,F10,, +keycode69=77,Num_Lock,Pointer_EnableKeys, +keycode70=78,Scroll_Lock,, +keycode71=79,KP_Home,KP_7, +keycode72=80,KP_Up,KP_8, +keycode73=81,KP_Prior,KP_9, +keycode74=82,KP_Subtract,, +keycode75=83,KP_Left,KP_4, +keycode76=84,KP_Begin,KP_5, +keycode77=85,KP_Right,KP_6, +keycode78=86,KP_Add,, +keycode79=87,KP_End,KP_1, +keycode80=88,KP_Down,KP_2, +keycode81=89,KP_Next,KP_3, +keycode82=90,KP_Insert,KP_0, +keycode83=91,KP_Delete,KP_Decimala1, +keycode86=94,less,greater +keycode87=95,F11,, +keycode88=96,F12,, +keycode89=97,Home,, +keycode90=98,Up,, +keycode91=99,Prior,, +keycode92=100,Left,, +keycode94=102,Right,, +keycode95=103,End,, +keycode96=104,Down,, +keycode97=105,Next,, +keycode98=106,Insert,, +keycode99=107,Delete,, +keycode100=108,KP_Enter,, +keycode101=109,Control_R,, +keycode102=110,Pause,Break, +keycode103=111,Print,Execute, +keycode104=112,KP_Divide,, +keycode105=113,Alt_R,Meta_R, diff --git a/x11/kdebase11/files/kwmrc b/x11/kdebase11/files/kwmrc new file mode 100644 index 000000000000..567c7d957791 --- /dev/null +++ b/x11/kdebase11/files/kwmrc @@ -0,0 +1,3 @@ +# KDE Config File +[Focus] +noFocusClasses=Kinput2, diff --git a/x11/kdebase11/files/patch-ba b/x11/kdebase11/files/patch-ba new file mode 100644 index 000000000000..0a8b2c1169de --- /dev/null +++ b/x11/kdebase11/files/patch-ba @@ -0,0 +1,37 @@ +--- kcontrol/locale/pics/Makefile.in.orig Wed Sep 8 00:20:25 1999 ++++ kcontrol/locale/pics/Makefile.in Wed Sep 15 23:46:12 1999 +@@ -170,7 +170,7 @@ + x_libraries = @x_libraries@ + xdmconfigsubdir = @xdmconfigsubdir@ + +-data_DATA = flag_de.gif flag_en.gif flag_fr.gif flag_C.gif flag_cs.gif flag_sv.gif flag_es.gif flag_ru.gif flag_nl.gif flag_hu.gif flag_da.gif flag_fi.gif flag_is.gif flag_it.gif flag_pt.gif flag_pl.gif flag_no.gif flag_el.gif flag_hr.gif flag_ro.gif flag_sk.gif flag_zh_TW.Big5.gif flag_zh_CN.GB2312.gif flag_en_UK.gif flag_ca.gif flag_pt_BR.gif flag_eo.gif flag_mk.gif flag_br.gif flag_he.gif flag_tr.gif flag_et.gif flag_se.gif flag_sl.gif flag_ja.gif flag_ko.gif flag_fr_CA.gif flag_us_eu.gif flag_fr_CH.gif flag_de_CH.gif ++data_DATA = flag_de.xpm flag_en.xpm flag_fr.xpm flag_C.xpm flag_cs.xpm flag_sv.xpm flag_es.xpm flag_ru.xpm flag_nl.xpm flag_hu.xpm flag_da.xpm flag_fi.xpm flag_is.xpm flag_it.xpm flag_pt.xpm flag_pl.xpm flag_no.xpm flag_el.xpm flag_hr.xpm flag_ro.xpm flag_sk.xpm flag_zh_TW.Big5.xpm flag_zh_CN.GB2312.xpm flag_en_UK.xpm flag_ca.xpm flag_pt_BR.xpm flag_eo.xpm flag_mk.xpm flag_br.xpm flag_he.xpm flag_tr.xpm flag_et.xpm flag_se.xpm flag_sl.xpm flag_ja.xpm flag_ko.xpm flag_fr_CA.xpm flag_us_eu.xpm flag_fr_CH.xpm flag_de_CH.xpm + + + datadir = $(kde_datadir)/kcmlocale/pics +@@ -190,6 +190,7 @@ + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: ++.SUFFIXES: .gif .xpm + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kcontrol/locale/pics/Makefile + +@@ -301,3 +302,6 @@ + # 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. + .NOEXPORT: ++ ++.gif.xpm: ++ $(LOCALBASE)/bin/convert $< $@ +--- kcontrol/locale/klangcombo.cpp.orig Sat Sep 11 03:37:58 1999 ++++ kcontrol/locale/klangcombo.cpp Sat Sep 11 03:38:08 1999 +@@ -55,7 +55,7 @@ + QPixmap pm(w, 16); + + KIconLoader iconLoader; +- QPixmap flag(iconLoader.loadIcon(QString("flag_")+tag(lang)+".gif")); ++ QPixmap flag(iconLoader.loadIcon(QString("flag_")+tag(lang)+".xpm")); + + pm.fill(colorGroup().background()); + p.begin(&pm); diff --git a/x11/kdebase11/files/patch-bb b/x11/kdebase11/files/patch-bb new file mode 100644 index 000000000000..f07bfa646348 --- /dev/null +++ b/x11/kdebase11/files/patch-bb @@ -0,0 +1,11 @@ +--- kikbd/maps/Makefile.in.orig Wed Sep 8 00:20:32 1999 ++++ kikbd/maps/Makefile.in Wed Sep 15 23:49:42 1999 +@@ -170,7 +170,7 @@ + x_libraries = @x_libraries@ + xdmconfigsubdir = @xdmconfigsubdir@ + +-data_DATA = cf.kimap csz.kimap pl.kimap rum.kimap ua.kimap uawm.kimap csp.kimap hu.kimap plnew.kimap ruw.kimap uam.kimap csy.kimap ru.kimap ruwm.kimap uaw.kimap bg.kimap fr.kimap de.kimap en.kimap el1.kimap el7.kimap lt.kimap he.kimap rua.kimap rui.kimap rumcyr.kimap skp.kimap sky.kimap skz.kimap es.kimap no.kimap sv.kimap fi.kimap se.kimap weu.kimap is.kimap fr_ch.kimap de_ch.kimap dv.kimap hr.kimap it.kimap la.kimap th.kimap ro.kimap pt.kimap pt-acc.kimap et.kimap dva.kimap trq.kimap ++data_DATA = cf.kimap csz.kimap pl.kimap rum.kimap ua.kimap uawm.kimap csp.kimap hu.kimap plnew.kimap ruw.kimap uam.kimap csy.kimap ru.kimap ruwm.kimap uaw.kimap bg.kimap fr.kimap de.kimap en.kimap el1.kimap el7.kimap lt.kimap he.kimap rua.kimap rui.kimap rumcyr.kimap skp.kimap sky.kimap skz.kimap es.kimap no.kimap sv.kimap fi.kimap se.kimap weu.kimap is.kimap fr_ch.kimap de_ch.kimap dv.kimap hr.kimap it.kimap la.kimap th.kimap ro.kimap pt.kimap pt-acc.kimap et.kimap dva.kimap trq.kimap ja.kimap + + + # pt.kimap pt-acc.kimap diff --git a/x11/kdebase11/files/patch-bc b/x11/kdebase11/files/patch-bc new file mode 100644 index 000000000000..19139a2f36e9 --- /dev/null +++ b/x11/kdebase11/files/patch-bc @@ -0,0 +1,11 @@ +--- po/ja/Makefile.in.orig Thu Sep 16 16:53:44 1999 ++++ po/ja/Makefile.in Thu Sep 16 16:54:09 1999 +@@ -173,7 +173,7 @@ + x_libraries = @x_libraries@ + xdmconfigsubdir = @xdmconfigsubdir@ + +-GMOFILES = kfind.gmo kdehelp.gmo kcmdisplay.gmo kvt.gmo kfm.gmo kwm.gmo kfontmanager.gmo kdm.gmo kpanel.gmo klock.gmo krootwm.gmo kcmbell.gmo kcminfo.gmo kcminput.gmo kcmkwm.gmo kcmsamba.gmo kcmsample.gmo kcontrol.gmo kmenuedit.gmo kdmconfig.gmo kcmkpanel.gmo kcmlocale.gmo kcmsyssound.gmo kstart.gmo kikbd.gmo konsole.gmo kcmkfm.gmo kcmkeys.gmo kbgndwm.gmo kpager.gmo ++GMOFILES = kfind.gmo kdehelp.gmo kcmdisplay.gmo kvt.gmo kfm.gmo kwm.gmo kfontmanager.gmo kdm.gmo kpanel.gmo klock.gmo krootwm.gmo kcmbell.gmo kcminfo.gmo kcminput.gmo kcmkwm.gmo kcmsamba.gmo kcmsample.gmo kcontrol.gmo kmenuedit.gmo kdmconfig.gmo kcmkpanel.gmo kcmlocale.gmo kcmsyssound.gmo kstart.gmo kikbd.gmo konsole.gmo kcmkfm.gmo kcmkeys.gmo kbgndwm.gmo kpager.gmo kthememgr.gmo + + + POFILES = $(GMOFILES:.gmo=.po) diff --git a/x11/kdebase11/files/patch-bd b/x11/kdebase11/files/patch-bd new file mode 100644 index 000000000000..5edadef78d3e --- /dev/null +++ b/x11/kdebase11/files/patch-bd @@ -0,0 +1,17 @@ +--- kpanel/sample_kdelnk_files/Makefile.in.orig Fri May 21 21:24:46 1999 ++++ kpanel/sample_kdelnk_files/Makefile.in Fri May 21 21:36:28 1999 +@@ -302,14 +302,6 @@ + + install-data-local: + $(mkinstalldirs) $(kdisknavdir) +- @for dir in /cdrom /mnt/cdrom /CDROM /CD-ROM ; do \ +- if test -d $$dir ; then \ +- echo $(INSTALL_DATA) $(srcdir)/CD-ROM.kdelnk $(kdisknavdir) ;\ +- $(INSTALL_DATA) $(srcdir)/CD-ROM.kdelnk $(kdisknavdir) ; \ +- echo "URL=$$dir" >> $(kdisknavdir)/CD-ROM.kdelnk ; \ +- break; \ +- fi ; \ +- done + + uninstall-local: + -rm -f $(kdisknavdir)/CD-ROM.kdelnk diff --git a/x11/kdebase11/files/patch-be b/x11/kdebase11/files/patch-be new file mode 100644 index 000000000000..e95ef4dc4073 --- /dev/null +++ b/x11/kdebase11/files/patch-be @@ -0,0 +1,13 @@ +*** kvt/xsetup.c.orig Tue Mar 30 17:23:20 1999 +--- kvt/xsetup.c Tue Jun 22 21:50:56 1999 +*************** +*** 228,233 **** +--- 228,235 ---- + char *terminal = NULL; + display_name = getenv("DISPLAY"); + ++ reg_font_handles[DEFAULT_FONT] = 0; ++ + screen = DefaultScreen(display); + colormap = DefaultColormap(display, screen); + diff --git a/x11/kdebase11/pkg-plist b/x11/kdebase11/pkg-plist index 6a8ffd72acdf..53586ca494b7 100644 --- a/x11/kdebase11/pkg-plist +++ b/x11/kdebase11/pkg-plist @@ -311,46 +311,46 @@ share/apps/kappfinder/pics/xosview.xpm share/apps/kappfinder/pics/xpaint.xpm share/apps/kappfinder/pics/xpdf.xpm share/apps/kappfinder/pics/xv.xpm -share/apps/kcmlocale/pics/flag_C.gif -share/apps/kcmlocale/pics/flag_br.gif -share/apps/kcmlocale/pics/flag_ca.gif -share/apps/kcmlocale/pics/flag_cs.gif -share/apps/kcmlocale/pics/flag_da.gif -share/apps/kcmlocale/pics/flag_de.gif -share/apps/kcmlocale/pics/flag_de_CH.gif -share/apps/kcmlocale/pics/flag_el.gif -share/apps/kcmlocale/pics/flag_en.gif -share/apps/kcmlocale/pics/flag_en_UK.gif -share/apps/kcmlocale/pics/flag_eo.gif -share/apps/kcmlocale/pics/flag_es.gif -share/apps/kcmlocale/pics/flag_et.gif -share/apps/kcmlocale/pics/flag_fi.gif -share/apps/kcmlocale/pics/flag_fr.gif -share/apps/kcmlocale/pics/flag_fr_CA.gif -share/apps/kcmlocale/pics/flag_fr_CH.gif -share/apps/kcmlocale/pics/flag_he.gif -share/apps/kcmlocale/pics/flag_hr.gif -share/apps/kcmlocale/pics/flag_hu.gif -share/apps/kcmlocale/pics/flag_is.gif -share/apps/kcmlocale/pics/flag_it.gif -share/apps/kcmlocale/pics/flag_ja.gif -share/apps/kcmlocale/pics/flag_ko.gif -share/apps/kcmlocale/pics/flag_mk.gif -share/apps/kcmlocale/pics/flag_nl.gif -share/apps/kcmlocale/pics/flag_no.gif -share/apps/kcmlocale/pics/flag_pl.gif -share/apps/kcmlocale/pics/flag_pt.gif -share/apps/kcmlocale/pics/flag_pt_BR.gif -share/apps/kcmlocale/pics/flag_ro.gif -share/apps/kcmlocale/pics/flag_ru.gif -share/apps/kcmlocale/pics/flag_se.gif -share/apps/kcmlocale/pics/flag_sk.gif -share/apps/kcmlocale/pics/flag_sl.gif -share/apps/kcmlocale/pics/flag_sv.gif -share/apps/kcmlocale/pics/flag_tr.gif -share/apps/kcmlocale/pics/flag_us_eu.gif -share/apps/kcmlocale/pics/flag_zh_CN.GB2312.gif -share/apps/kcmlocale/pics/flag_zh_TW.Big5.gif +share/apps/kcmlocale/pics/flag_C.xpm +share/apps/kcmlocale/pics/flag_br.xpm +share/apps/kcmlocale/pics/flag_ca.xpm +share/apps/kcmlocale/pics/flag_cs.xpm +share/apps/kcmlocale/pics/flag_da.xpm +share/apps/kcmlocale/pics/flag_de.xpm +share/apps/kcmlocale/pics/flag_de_CH.xpm +share/apps/kcmlocale/pics/flag_el.xpm +share/apps/kcmlocale/pics/flag_en.xpm +share/apps/kcmlocale/pics/flag_en_UK.xpm +share/apps/kcmlocale/pics/flag_eo.xpm +share/apps/kcmlocale/pics/flag_es.xpm +share/apps/kcmlocale/pics/flag_et.xpm +share/apps/kcmlocale/pics/flag_fi.xpm +share/apps/kcmlocale/pics/flag_fr.xpm +share/apps/kcmlocale/pics/flag_fr_CA.xpm +share/apps/kcmlocale/pics/flag_fr_CH.xpm +share/apps/kcmlocale/pics/flag_he.xpm +share/apps/kcmlocale/pics/flag_hr.xpm +share/apps/kcmlocale/pics/flag_hu.xpm +share/apps/kcmlocale/pics/flag_is.xpm +share/apps/kcmlocale/pics/flag_it.xpm +share/apps/kcmlocale/pics/flag_ja.xpm +share/apps/kcmlocale/pics/flag_ko.xpm +share/apps/kcmlocale/pics/flag_mk.xpm +share/apps/kcmlocale/pics/flag_nl.xpm +share/apps/kcmlocale/pics/flag_no.xpm +share/apps/kcmlocale/pics/flag_pl.xpm +share/apps/kcmlocale/pics/flag_pt.xpm +share/apps/kcmlocale/pics/flag_pt_BR.xpm +share/apps/kcmlocale/pics/flag_ro.xpm +share/apps/kcmlocale/pics/flag_ru.xpm +share/apps/kcmlocale/pics/flag_se.xpm +share/apps/kcmlocale/pics/flag_sk.xpm +share/apps/kcmlocale/pics/flag_sl.xpm +share/apps/kcmlocale/pics/flag_sv.xpm +share/apps/kcmlocale/pics/flag_tr.xpm +share/apps/kcmlocale/pics/flag_us_eu.xpm +share/apps/kcmlocale/pics/flag_zh_CN.GB2312.xpm +share/apps/kcmlocale/pics/flag_zh_TW.Big5.xpm share/apps/kcontrol/pics/kdekcc.xpm share/apps/kdisknav/KDE.kdelnk share/apps/kdisknav/Root.kdelnk @@ -447,6 +447,7 @@ share/apps/kikbd/hr.kimap share/apps/kikbd/hu.kimap share/apps/kikbd/is.kimap share/apps/kikbd/it.kimap +share/apps/kikbd/ja.kimap share/apps/kikbd/la.kimap share/apps/kikbd/lt.kimap share/apps/kikbd/no.kimap @@ -549,6 +550,7 @@ share/config/kdmrc share/config/kfmrc share/config/kikbdrc share/config/kpanelrc +share/config/kwmrc share/doc/HTML/en/kcontrol/index-1.html share/doc/HTML/en/kcontrol/index-2.html share/doc/HTML/en/kcontrol/index.html @@ -1825,6 +1827,7 @@ share/locale/ja/LC_MESSAGES/konsole.mo share/locale/ja/LC_MESSAGES/kpager.mo share/locale/ja/LC_MESSAGES/kpanel.mo share/locale/ja/LC_MESSAGES/krootwm.mo +share/locale/ja/LC_MESSAGES/kthememgr.mo share/locale/ja/LC_MESSAGES/kvt.mo share/locale/ja/LC_MESSAGES/kwm.mo share/locale/ko/LC_MESSAGES/kcmbell.mo diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile index fbcf1074ffe8..670f93df94ae 100644 --- a/x11/kdelibs11/Makefile +++ b/x11/kdelibs11/Makefile @@ -6,12 +6,17 @@ # PORTNAME= kdelibs -PORTVERSION= 1.1.2.1 +PORTVERSION= 1.1.2 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= $(MASTER_SITE_KDE) MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2 DISTNAME= kdelibs-1.1.2 +PATCH_SITES= ftp://ftp.kde.gr.jp/pub/kde/stable/latest/distribution/tar/generic/jp-patch/ +PATCHFILES= kdelibs-ja.19990903.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= will@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ @@ -37,20 +42,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ MTREE_CMD= ${CAT} ${MTREE_FILE} ${FILESDIR}/kde.dist | /usr/sbin/mtree MTREE_ARGS= -U -d -e -p -pre-install: -.for applink in Applications Development Games Graphics Internet Multimedia \ - Network Settings System Utilities - @${MKDIR} ${PREFIX}/share/applnk/${applink} -.endfor -.for lang in cs da de el es fi fr hu it ja nl pl pt ru sv zh_CN.GB2312 - @${MKDIR} ${PREFIX}/share/doc/HTML/${lang} -.endfor -.for mimelnk in application audio image inode text video - @${MKDIR} ${PREFIX}/share/mimelnk/${mimelnk} -.endfor - @${MKDIR} ${PREFIX}/share/icons/large - @${MKDIR} ${PREFIX}/share/icons/mini - @${MKDIR} ${PREFIX}/share/sounds - @${MKDIR} ${PREFIX}/share/wallpapers - .include <bsd.port.mk> diff --git a/x11/kdelibs11/distinfo b/x11/kdelibs11/distinfo index 71d23a67f3b1..3f1c320f1a14 100644 --- a/x11/kdelibs11/distinfo +++ b/x11/kdelibs11/distinfo @@ -1 +1,2 @@ MD5 (kdelibs-1.1.2.tar.bz2) = bd19469c2e6c8951e26f196e050cb096 +MD5 (kdelibs-ja.19990903.diff.gz) = b34cafbbb3784b86125779f06e60c935 diff --git a/x11/kdelibs11/files/patch-ba b/x11/kdelibs11/files/patch-ba new file mode 100644 index 000000000000..407a2f75c96a --- /dev/null +++ b/x11/kdelibs11/files/patch-ba @@ -0,0 +1,19 @@ +*** mediatool/chunk.c.orig Fri Oct 17 08:11:42 1997 +--- mediatool/chunk.c Sun May 9 14:03:59 1999 +*************** +*** 77,83 **** + if (strlen(ChunkName) != 4) + return(NULL); + +! if (strncmp(adress, "MDTO", 4) !=0 ) + return(NULL); + + /* Increment adress pointer by 4. The pointer now points to the first +--- 77,83 ---- + if (strlen(ChunkName) != 4) + return(NULL); + +! if (!adress || strncmp(adress, "MDTO", 4) !=0 ) + return(NULL); + + /* Increment adress pointer by 4. The pointer now points to the first diff --git a/x11/kdelibs11/pkg-plist b/x11/kdelibs11/pkg-plist index ace82176e6be..81ea670d4bda 100644 --- a/x11/kdelibs11/pkg-plist +++ b/x11/kdelibs11/pkg-plist @@ -120,39 +120,40 @@ include/kwizard.h include/kwm.h include/kwmmapp.h include/mediatool.h +include/nkf.h include/sections.h include/stl_headers.h include/xview.h +lib/libjscript.la lib/libjscript.so lib/libjscript.so.%%LIBVER%% -lib/libjscript.la +lib/libkab.la lib/libkab.so lib/libkab.so.%%LIBVER%% -lib/libkab.la +lib/libkdecore.la lib/libkdecore.so lib/libkdecore.so.%%LIBVER%% -lib/libkdecore.la +lib/libkdeui.la lib/libkdeui.so lib/libkdeui.so.%%LIBVER%% -lib/libkdeui.la +lib/libkfile.la lib/libkfile.so lib/libkfile.so.%%LIBVER%% -lib/libkfile.la +lib/libkfm.la lib/libkfm.so lib/libkfm.so.%%LIBVER%% -lib/libkfm.la +lib/libkhtmlw.la lib/libkhtmlw.so lib/libkhtmlw.so.%%LIBVER%% -lib/libkhtmlw.la +lib/libkimgio.la lib/libkimgio.so lib/libkimgio.so.%%LIBVER%% -lib/libkimgio.la +lib/libkspell.la lib/libkspell.so lib/libkspell.so.%%LIBVER%% -lib/libkspell.la +lib/libmediatool.la lib/libmediatool.so lib/libmediatool.so.%%LIBVER%% -lib/libmediatool.la share/apps/kab/pics/background_1.jpg share/apps/kab/pics/dialog_background.jpg share/apps/kde/pics/arrow_down.xbm @@ -184,6 +185,7 @@ share/doc/HTML/en/kfiledialog/viewmag.gif share/doc/HTML/en/kspell/ksconfig.html share/doc/HTML/en/kspell/ksdialog.html share/doc/HTML/en/kspell/kspell.html +@exec ln -sf en %D/share/doc/HTML/default share/locale/br/LC_MESSAGES/kde.mo share/locale/br/charset share/locale/ca/LC_MESSAGES/kde.mo @@ -311,16 +313,43 @@ share/toolbar/viewmag+.xpm share/toolbar/viewmag-.xpm share/toolbar/viewmag.xpm share/toolbar/viewzoom.xpm -@unexec rmdir %D/share/wallpapers 2>/dev/null || true -@unexec rmdir %D/share/toolbar 2>/dev/null || true -@unexec rmdir %D/share/sounds 2>/dev/null || true -@unexec rmdir %D/share/mimelnk/video 2>/dev/null || true -@unexec rmdir %D/share/mimelnk/text 2>/dev/null || true -@unexec rmdir %D/share/mimelnk/inode 2>/dev/null || true -@unexec rmdir %D/share/mimelnk/image 2>/dev/null || true -@unexec rmdir %D/share/mimelnk/audio 2>/dev/null || true -@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true -@unexec rmdir %D/share/mimelnk 2>/dev/null || true +@exec mkdir -p %D/share/applnk/Applications +@exec mkdir -p %D/share/applnk/Development +@exec mkdir -p %D/share/applnk/Games +@exec mkdir -p %D/share/applnk/Graphics +@exec mkdir -p %D/share/applnk/Internet +@exec mkdir -p %D/share/applnk/Multimedia +@exec mkdir -p %D/share/applnk/Network +@exec mkdir -p %D/share/applnk/Settings +@exec mkdir -p %D/share/applnk/System +@exec mkdir -p %D/share/applnk/Utilities +@exec mkdir -p %D/share/doc/HTML/cs +@exec mkdir -p %D/share/doc/HTML/da +@exec mkdir -p %D/share/doc/HTML/de +@exec mkdir -p %D/share/doc/HTML/el +@exec mkdir -p %D/share/doc/HTML/es +@exec mkdir -p %D/share/doc/HTML/fi +@exec mkdir -p %D/share/doc/HTML/fr +@exec mkdir -p %D/share/doc/HTML/hu +@exec mkdir -p %D/share/doc/HTML/it +@exec mkdir -p %D/share/doc/HTML/ja +@exec mkdir -p %D/share/doc/HTML/nl +@exec mkdir -p %D/share/doc/HTML/pl +@exec mkdir -p %D/share/doc/HTML/pt +@exec mkdir -p %D/share/doc/HTML/ru +@exec mkdir -p %D/share/doc/HTML/sv +@exec mkdir -p %D/share/doc/HTML/zh_CN.GB2312 +@exec mkdir -p %D/share/icons/large +@exec mkdir -p %D/share/icons/mini +@exec mkdir -p %D/share/mimelnk/application +@exec mkdir -p %D/share/mimelnk/audio +@exec mkdir -p %D/share/mimelnk/image +@exec mkdir -p %D/share/mimelnk/inode +@exec mkdir -p %D/share/mimelnk/text +@exec mkdir -p %D/share/mimelnk/video +@exec mkdir -p %D/share/locale/hs/LC_MESSAGES +@exec mkdir -p %D/share/sounds +@exec mkdir -p %D/share/wallpapers @unexec rmdir %D/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/zh_TW.Big5 2>/dev/null || true @unexec rmdir %D/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true @@ -393,46 +422,56 @@ share/toolbar/viewzoom.xpm @unexec rmdir %D/share/locale/br 2>/dev/null || true @unexec rmdir %D/share/locale 2>/dev/null || true @unexec rm -f %D/share/doc/HTML/default -@unexec rmdir %D/share/icons/mini 2>/dev/null || true -@unexec rmdir %D/share/icons/large 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/zh_CN.GB2312 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/pl 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/ja 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/hu 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/fi 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/en/kspell 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/en/kfiledialog 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/en/kdelibs 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/el 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/cs 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true -@unexec rmdir %D/share/config 2>/dev/null || true -@unexec rmdir %D/share/apps/khtmlw/pics 2>/dev/null || true -@unexec rmdir %D/share/apps/khtmlw 2>/dev/null || true -@unexec rmdir %D/share/apps/kde/pics 2>/dev/null || true -@unexec rmdir %D/share/apps/kde 2>/dev/null || true -@unexec rmdir %D/share/apps/kab/pics 2>/dev/null || true -@unexec rmdir %D/share/apps/kab 2>/dev/null || true -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true -@unexec rmdir %D/share/applnk/System 2>/dev/null || true -@unexec rmdir %D/share/applnk/Settings 2>/dev/null || true -@unexec rmdir %D/share/applnk/Network 2>/dev/null || true -@unexec rmdir %D/share/applnk/Multimedia 2>/dev/null || true -@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true -@unexec rmdir %D/share/applnk/Graphics 2>/dev/null || true -@unexec rmdir %D/share/applnk/Games 2>/dev/null || true -@unexec rmdir %D/share/applnk/Development 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrm share/wallpapers +@dirrm share/toolbar +@dirrm share/sounds +@dirrm share/mimelnk/video +@dirrm share/mimelnk/text +@dirrm share/mimelnk/inode +@dirrm share/mimelnk/image +@dirrm share/mimelnk/audio +@dirrm share/mimelnk/application +@dirrm share/mimelnk +@dirrm share/icons/mini +@dirrm share/icons/large +@dirrm share/icons +@dirrm share/doc/HTML/zh_CN.GB2312 +@dirrm share/doc/HTML/sv +@dirrm share/doc/HTML/ru +@dirrm share/doc/HTML/pt +@dirrm share/doc/HTML/pl +@dirrm share/doc/HTML/nl +@dirrm share/doc/HTML/ja +@dirrm share/doc/HTML/it +@dirrm share/doc/HTML/hu +@dirrm share/doc/HTML/fr +@dirrm share/doc/HTML/fi +@dirrm share/doc/HTML/es +@dirrm share/doc/HTML/en/kspell +@dirrm share/doc/HTML/en/kfiledialog +@dirrm share/doc/HTML/en/kdelibs +@dirrm share/doc/HTML/en +@dirrm share/doc/HTML/el +@dirrm share/doc/HTML/de +@dirrm share/doc/HTML/da +@dirrm share/doc/HTML/cs +@dirrm share/doc/HTML +@dirrm share/config +@dirrm share/apps/khtmlw/pics +@dirrm share/apps/khtmlw +@dirrm share/apps/kde/pics +@dirrm share/apps/kde +@dirrm share/apps/kab/pics +@dirrm share/apps/kab +@dirrm share/apps +@dirrm share/applnk/Utilities +@dirrm share/applnk/System +@dirrm share/applnk/Settings +@dirrm share/applnk/Network +@dirrm share/applnk/Multimedia +@dirrm share/applnk/Internet +@dirrm share/applnk/Graphics +@dirrm share/applnk/Games +@dirrm share/applnk/Development +@dirrm share/applnk/Applications +@dirrm share/applnk |