Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Feb 2000 13:18:29 +0900 (JST)
From:      mac@jp.FreeBSD.org
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/16771: update ports : windowmaker-i18n
Message-ID:  <200002170418.NAA00453@daemon.pssys.flab.fujitsu.co.jp>

next in thread | raw e-mail | index | archive | help

>Number:         16771
>Category:       ports
>Synopsis:       update ports : windowmaker-i18n
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 16 20:20:00 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Masahide -mac- NODA
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:
>Description:

sync windowmaker ports
	- make libwmfun
	- work correctly get-wraster-flags

>How-To-Repeat:

>Fix:

please apply this patch :

diff -urN -x CVS -x work windowmaker-i18n.orig/Makefile windowmaker-i18n/Makefile
--- windowmaker-i18n.orig/Makefile	Thu Feb 17 09:58:56 2000
+++ windowmaker-i18n/Makefile	Thu Feb 17 13:11:27 2000
@@ -33,7 +33,11 @@
 		CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \
 		LINGUAS="da de es fi fr hr it ja_JP.EUC ko nl no pl pt ru zh_TW.Big5 zh_CN"
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
-	--with-nlsdir=${PREFIX}/share/locale --disable-debug
+	--with-nlsdir=${PREFIX}/share/locale \
+	--with-libs-from="-L${LOCALBASE}/lib" \
+	--with-incs-from="-I${LOCALBASE}/include" \
+	--with-appspath="${PREFIX}/GNUstep/Apps" \
+	--disable-debug
 
 MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
 	wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x wsetfont.1x
@@ -57,6 +61,10 @@
 pre-extract:
 	${ECHO} "You can add hooks for Gnome and KDE by defining USE_GNOME and/or USE_KDE"
 .endif
+
+post-extract:
+	@cd ${WRKSRC} && \
+	${TAR} xfz libwmfun-0.0.2.tar.gz
 
 .include <bsd.port.pre.mk>
 
diff -urN -x CVS -x work windowmaker-i18n.orig/patches/patch-cc windowmaker-i18n/patches/patch-cc
--- windowmaker-i18n.orig/patches/patch-cc	Thu Jan  1 09:00:00 1970
+++ windowmaker-i18n/patches/patch-cc	Thu Feb 17 10:04:00 2000
@@ -0,0 +1,22 @@
+--- configure.orig	Tue Feb 15 16:00:11 2000
++++ configure	Tue Feb 15 16:02:20 2000
+@@ -5398,7 +5398,8 @@
+ 	WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \
+ 	WindowMaker/Themes/Makefile \
+ 	WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
+-	WPrefs.app/po/Makefile  src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++	WPrefs.app/po/Makefile \
++	libwmfun-0.0.2/libwmfun/Makefile src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+ EOF
+ cat >> $CONFIG_STATUS <<EOF
+ 
+@@ -5531,7 +5532,8 @@
+ 	WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \
+ 	WindowMaker/Themes/Makefile \
+ 	WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
+-	WPrefs.app/po/Makefile "}
++	WPrefs.app/po/Makefile \
++	libwmfun-0.0.2/libwmfun/Makefile "}
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF
+ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff -urN -x CVS -x work windowmaker-i18n.orig/patches/patch-cd windowmaker-i18n/patches/patch-cd
--- windowmaker-i18n.orig/patches/patch-cd	Thu Jan  1 09:00:00 1970
+++ windowmaker-i18n/patches/patch-cd	Thu Feb 17 10:04:07 2000
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	Tue Feb 15 16:03:27 2000
++++ Makefile.in	Tue Feb 15 15:22:24 2000
+@@ -92,7 +92,8 @@
+ X_LIBRARY_PATH = @X_LIBRARY_PATH@
+ wprefsdir = @wprefsdir@
+ 
+-SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc 	contrib
++SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc 	contrib \
++		libwmfun-0.0.2/libwmfun
+ 
+ 
+ EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL 	Install acconfig.h INSTALL.pt 	mkpatch README.KDE README.GNOME WindowMaker.lsm.in 	docklib-0.2.tar.gz libwmfun-0.0.2.tar.gz 
diff -urN -x CVS -x work windowmaker-i18n.orig/patches/patch-ce windowmaker-i18n/patches/patch-ce
--- windowmaker-i18n.orig/patches/patch-ce	Thu Jan  1 09:00:00 1970
+++ windowmaker-i18n/patches/patch-ce	Thu Feb 17 10:04:15 2000
@@ -0,0 +1,39 @@
+--- libwmfun-0.0.2/libwmfun/Makefile.in.orig	Tue Feb 15 16:04:35 2000
++++ libwmfun-0.0.2/libwmfun/Makefile.in	Tue Feb 15 15:44:31 2000
+@@ -38,7 +38,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ 
+-top_builddir = ..
++top_builddir = ../..
+ 
+ ACLOCAL = @ACLOCAL@
+ AUTOCONF = @AUTOCONF@
+@@ -69,6 +69,8 @@
+ RANLIB = @RANLIB@
+ VERSION = @VERSION@
+ 
++INCLUDES =  	-I$(top_srcdir)/wrlib	-I$(top_srcdir)/src	-I$(top_srcdir)/WINGs	@HEADER_SEARCH_PATH@
++
+ lib_LTLIBRARIES = libwmfun.la
+ 
+ libwmfun_la_SOURCES = bilinear.c 		fade.c 		generic.c 		generic.h 		getopt.c 		getopt.h 		getopt1.c 		wave.c
+@@ -104,12 +106,12 @@
+ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libwmfun/Makefile
+-
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++#	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libwmfun/Makefile
++#
++#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++#	cd $(top_builddir) \
++#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+ 
+ mostlyclean-libLTLIBRARIES:
diff -urN -x CVS -x work windowmaker-i18n.orig/pkg/PLIST windowmaker-i18n/pkg/PLIST
--- windowmaker-i18n.orig/pkg/PLIST	Sat Oct  9 06:35:34 1999
+++ windowmaker-i18n/pkg/PLIST	Thu Feb 17 10:03:22 2000
@@ -160,6 +160,9 @@
 lib/libWINGs.a
 lib/libWMaker.a
 lib/libWUtil.a
+lib/libwmfun.a
+lib/libwmfun.so
+lib/libwmfun.so.0
 lib/libwraster.a
 lib/libwraster.so
 lib/libwraster.so.3

>Release-Note:
>Audit-Trail:
>Unformatted:


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?200002170418.NAA00453>