Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Oct 2000 23:32:23 -0700
From:      Jeremy Lea <reg@freebsd.org>
To:        Satoshi Asami <asami@freebsd.org>
Cc:        ade@freebsd.org, ports@freebsd.org
Subject:   Re: share/locale
Message-ID:  <20001009233223.K30468@shale.csir.co.za>
In-Reply-To: <200010092133.e99LXZa94937@silvia.hip.berkeley.edu>; from asami@freebsd.org on Mon, Oct 09, 2000 at 02:33:35PM -0700
References:  <200010092133.e99LXZa94937@silvia.hip.berkeley.edu>

next in thread | previous in thread | raw e-mail | index | archive | help
Hi,

On Mon, Oct 09, 2000 at 02:33:35PM -0700, Satoshi Asami wrote:
> It might be a figment of my imagination but there seem to be some
> ports that are leaving the share/locale directory behind after the
> bsd.gnome.mk change.
> 
>   http://bento.FreeBSD.org/errorlogs/errorlogs/a.4.20001008/windowmaker-0.62.1.log

This ones never been found out before...  It was making
${LOCALBASE}/lib/locale.  Needs a depenency on gettext.

>   http://bento.FreeBSD.org/errorlogs/errorlogs/a.4.20001008/freeciv-1.11.4.log

My fault.  I removed a bunch of @dirrm's, but I didn't notice that the
port doesn't depend on gettext in the non-imlib case.  I also broke
freeciv-gtk, which is not really freeciv-gtk, but freeciv-imlib.

Patches attached.  Add gettext dependency for both.

 -Jeremy

-- 
FreeBSD - Because the best things in life are free...
                                           http://www.freebsd.org/

x11-wm/windowmaker:
  Maintainer:	sobomax@FreeBSD.org
  Changes: Makefile pkg-plist
  Adds   :
  Removes:

--- /usr/ports.ref/x11-wm/windowmaker/Makefile	Thu Oct  5 00:22:54 2000
+++ x11-wm/windowmaker/Makefile	Mon Oct  9 23:29:46 2000
@@ -20,7 +20,8 @@
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		PropList.2:${PORTSDIR}/devel/libPropList
+		PropList.2:${PORTSDIR}/devel/libPropList \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
@@ -30,7 +31,8 @@
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE} LIBS=-L${LOCALBASE}/lib \
-		CPPFLAGS=-I${LOCALBASE}/include
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LINGUAS="cs da de el es fi fr gl hr it ja ko nl no pl pt ro ru se sk tr zh_CN zh_TW.Big5"
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 	--with-nlsdir=${PREFIX}/share/locale \
 	--with-libs-from="-L${LOCALBASE}/lib" \
--- /usr/ports.ref/x11-wm/windowmaker/pkg-plist	Thu Jun 15 09:44:05 2000
+++ x11-wm/windowmaker/pkg-plist	Mon Oct  9 23:29:21 2000
@@ -312,6 +312,42 @@
 share/WindowMaker/plmenu.zh_CN
 share/WindowMaker/wmmacros
 share/WindowMaker/xtree.dat
+share/locale/cs/LC_MESSAGES/WPrefs.mo
+share/locale/cs/LC_MESSAGES/WindowMaker.mo
+share/locale/da/LC_MESSAGES/WindowMaker.mo
+share/locale/de/LC_MESSAGES/WPrefs.mo
+share/locale/de/LC_MESSAGES/WindowMaker.mo
+share/locale/el/LC_MESSAGES/WindowMaker.mo
+share/locale/es/LC_MESSAGES/WPrefs.mo
+share/locale/es/LC_MESSAGES/WindowMaker.mo
+share/locale/fi/LC_MESSAGES/WPrefs.mo
+share/locale/fi/LC_MESSAGES/WindowMaker.mo
+share/locale/fr/LC_MESSAGES/WPrefs.mo
+share/locale/fr/LC_MESSAGES/WindowMaker.mo
+share/locale/gl/LC_MESSAGES/WindowMaker.mo
+share/locale/hr/LC_MESSAGES/WPrefs.mo
+share/locale/hr/LC_MESSAGES/WindowMaker.mo
+share/locale/it/LC_MESSAGES/WPrefs.mo
+share/locale/it/LC_MESSAGES/WindowMaker.mo
+share/locale/ja/LC_MESSAGES/WPrefs.mo
+share/locale/ja/LC_MESSAGES/WindowMaker.mo
+share/locale/ko/LC_MESSAGES/WPrefs.mo
+share/locale/ko/LC_MESSAGES/WindowMaker.mo
+share/locale/nl/LC_MESSAGES/WindowMaker.mo
+share/locale/no/LC_MESSAGES/WindowMaker.mo
+share/locale/pl/LC_MESSAGES/WindowMaker.mo
+share/locale/pt/LC_MESSAGES/WPrefs.mo
+share/locale/pt/LC_MESSAGES/WindowMaker.mo
+share/locale/ro/LC_MESSAGES/WindowMaker.mo
+share/locale/ru/LC_MESSAGES/WPrefs.mo
+share/locale/ru/LC_MESSAGES/WindowMaker.mo
+share/locale/se/LC_MESSAGES/WindowMaker.mo
+share/locale/sk/LC_MESSAGES/WindowMaker.mo
+share/locale/tr/LC_MESSAGES/WindowMaker.mo
+share/locale/zh_CN/LC_MESSAGES/WPrefs.mo
+share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/WPrefs.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/WindowMaker.mo
 @exec mkdir -p %B/Sounds
 @dirrm share/WindowMaker/Themes/STEP2000.themed
 @dirrm share/WindowMaker/Themes/Night.themed

games/freeciv:
  Maintainer:	sheldonh@freebsd.org
  Changes: Makefile
  Adds   :
  Removes:

--- /usr/ports.ref/games/freeciv/Makefile	Wed Oct  4 23:57:34 2000
+++ games/freeciv/Makefile	Mon Oct  9 22:37:09 2000
@@ -14,10 +14,14 @@
 
 MAINTAINER=	sheldonh@freebsd.org
 
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+
 USE_XPM=	yes
 USE_BZIP2=	yes
 WANT_IMLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
@@ -26,5 +30,11 @@
 .else
 CONFIGURE_ARGS=	--disable-gtktest
 .endif
+
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>

games/freeciv-gtk:
  Maintainer:
  Changes: Makefile
  Adds   :
  Removes:

--- /usr/ports.ref/games/freeciv-gtk/Makefile	Tue Apr 25 23:56:18 2000
+++ games/freeciv-gtk/Makefile	Mon Oct  9 22:37:27 2000
@@ -7,6 +7,6 @@
 
 MASTERDIR=	${.CURDIR}/../freeciv
 
-WITH_GTK=	yes
+WITH_IMLIB=	yes
 
 .include "${MASTERDIR}/Makefile"


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001009233223.K30468>