Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 08 Oct 1997 12:01:45 +0900
From:      Makoto MATSUSHITA <matusita@jp.freebsd.org>
To:        FreeBSD-gnats-submit@FreeBSD.ORG
Subject:   ports/4725: x11/fvwm2 update, based on fvwm 2.0.46 / email address change
Message-ID:  <19971008120145U.matusita@jp.freebsd.org>
Resent-Message-ID: <199710080310.UAA13404@hub.freebsd.org>

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

>Number:         4725
>Category:       ports
>Synopsis:       x11/fvwm2 update, based on fvwm 2.0.46 / email address change
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct  7 20:10:01 PDT 1997
>Last-Modified:
>Originator:     Makoto MATSUSHITA
>Organization:
Japan FreeBSD Users' Group / Osaka University
>Release:        FreeBSD 3.0-CURRENT i386
>Environment:

	FreeBSD 3.0-CURRENT / FreeBSD 2.2.2-RELEASE

>Description:

	fvwm 2.0.46 was released. Update x11/fvwm2 ports.

	And, please commiters, change my email address which is listed
	in Contributors section of FreeBSD Handbook. Now it shows

		Makoto Matsushita <matusita@ics.es.osaka-u.ac.jp

	But I want to change my email address to

		Makoto MATSUSHITA <matusita@jp.freebsd.org>

	I wanna use this email address with my FreeBSD-related work.
	I already use this email address in x11/fvwm2/Makefile, and also
	in THIS PR.

>How-To-Repeat:

>Fix:

Apply following patch to x11/fvwm2 of ports-current. Sorry for long email.

*** Makefile.dist	Tue Jun 10 06:57:41 1997
--- Makefile	Wed Oct  8 01:43:36 1997
***************
*** 7,20 ****
  # $Id: Makefile,v 1.9 1997/06/09 21:57:41 max Exp $
  #
  
! DISTNAME=	fvwm-2.0.45
  CATEGORIES=	x11
  MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
  		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
  		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
  		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/ \
  		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
! DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Jan24.tar.gz
  
  MAINTAINER=	matusita@jp.freebsd.org
  
--- 7,20 ----
  # $Id: Makefile,v 1.9 1997/06/09 21:57:41 max Exp $
  #
  
! DISTNAME=	fvwm-2.0.46
  CATEGORIES=	x11
  MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
  		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
  		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
  		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/ \
  		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
! DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Oct04.tar.gz
  
  MAINTAINER=	matusita@jp.freebsd.org
  
***************
*** 23,29 ****
  USE_IMAKE=	yes
  
  # filenames.
! PATCH_FIXIT=	kits/patch/fix-2.0.45
  PATCH_I18N=	kits/patch/PATCH.I18N
  
  USE_PATCHFILES=	${PATCH_FIXIT} ${PATCH_I18N}
--- 23,29 ----
  USE_IMAKE=	yes
  
  # filenames.
! PATCH_FIXIT=	kits/patch/fix-2.0.46
  PATCH_I18N=	kits/patch/PATCH.I18N
  
  USE_PATCHFILES=	${PATCH_FIXIT} ${PATCH_I18N}
***************
*** 35,41 ****
  
  post-install:
  	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
! 	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \
  		${PREFIX}/lib/X11/fvwm2/pixmaps
  
  .include <bsd.port.mk>
--- 35,42 ----
  
  post-install:
  	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
! 	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${WRKSRC}/icons/*.xbm \
! 			${WRKSRC}/icons/*.bitmap ${WRKSRC}/icons/*.icon \
  		${PREFIX}/lib/X11/fvwm2/pixmaps
  
  .include <bsd.port.mk>
*** files/md5.dist	Mon Mar  3 20:31:45 1997
--- files/md5	Sat Oct  4 17:07:17 1997
***************
*** 1,2 ****
! MD5 (fvwm-2.0.45.tar.gz) = 6d5cfab435831ef9fd970d17c972a20c
! MD5 (fvwm-users-jp-kits.97Jan24.tar.gz) = 8312730d07e08e98075dff93f77a0836
--- 1,2 ----
! MD5 (fvwm-2.0.46.tar.gz) = da4a7d4c4e81e5de3ecdc02026fa1fa9
! MD5 (fvwm-users-jp-kits.97Oct04.tar.gz) = 7e4b5da259634142a76d0eb9e681a6ea
*** patches/patch-aa.dist	Mon Mar  3 20:31:46 1997
--- patches/patch-aa	Tue Oct  7 23:30:15 1997
***************
*** 9,15 ****
   
   
   /**************************************************************************
! @@ -263,6 +263,9 @@
   /* Or if you prefer a more minimal setup, you could try something like: */
   /* OPTION_DEFINES = -DSHAPE -DVECTOR_BUTTONS */
   
--- 9,15 ----
   
   
   /**************************************************************************
! @@ -268,6 +268,9 @@
   /* Or if you prefer a more minimal setup, you could try something like: */
   /* OPTION_DEFINES = -DSHAPE -DVECTOR_BUTTONS */
   
***************
*** 19,25 ****
   
   /***************************************************************************
    * The following section only needs to be changed if you do not want
! @@ -383,7 +386,7 @@
   #endif
   
   #ifndef FvwmIconPath
--- 19,25 ----
   
   /***************************************************************************
    * The following section only needs to be changed if you do not want
! @@ -388,7 +391,7 @@
   #endif
   
   #ifndef FvwmIconPath
***************
*** 34,42 ****
   NullMake()
   
   #if InstallSample
- -InstallNonExecFile(system.fvwmrc,$(FVWMDIR))
  +/* FreeBSD ports -- maybe a bug(typo?). reported. */
! +InstallNonExecFile(system$(FVWMRC),$(FVWMDIR))
  +/* FreeBSD ports */
  +/* FreeBSD ports -- More informations are welcomed :-) */
  +InstallNonExecFile(decor_examples,$(FVWMDIR))
--- 34,41 ----
   NullMake()
   
   #if InstallSample
  +/* FreeBSD ports -- maybe a bug(typo?). reported. */
!  InstallNonExecFile(system$(FVWMRC),$(FVWMDIR))
  +/* FreeBSD ports */
  +/* FreeBSD ports -- More informations are welcomed :-) */
  +InstallNonExecFile(decor_examples,$(FVWMDIR))
*** patches/patch-ab.dist	Mon Mar  3 20:31:46 1997
--- patches/patch-ab	Tue Oct  7 23:31:09 1997
***************
*** 1,6 ****
  --- Fvwm.tmpl.dist	Wed Jan 22 22:38:49 1997
  +++ Fvwm.tmpl	Thu Jan 30 15:24:10 1997
! @@ -400,8 +400,19 @@
   #else
   #ifdef i386SVR4Architecture
   KLUDGE_LIBS = -lnsl -lsocket
--- 1,6 ----
  --- Fvwm.tmpl.dist	Wed Jan 22 22:38:49 1997
  +++ Fvwm.tmpl	Thu Jan 30 15:24:10 1997
! @@ -408,8 +408,19 @@
   #else
   #ifdef i386SVR4Architecture
   KLUDGE_LIBS = -lnsl -lsocket
*** /dev/null	Wed Oct  8 01:14:43 1997
--- pkg/MESSAGE	Wed Oct  8 01:29:25 1997
***************
*** 0 ****
--- 1,23 ----
+ 
+ Notes for XFree86 3.3/3.3.1 and LANG=ja_JP.EUC:
+ 
+ There are some bug (?) in already released XFree86 based on X11R6.3, i.e.,
+ XFree86 3.3 and XFree86 3.3.1, when X client runs under LANG=ja_JP.EUC.
+ 
+ If you wanna use this fvwm2 with LANG=ja_JP.EUC (which means "run fvwm2,
+ with environment variable 'LANG' is set to 'ja_JP.EUC' to enable to display
+ Japanese Kanji/Hiragana/Katakana characters"), apply following patch to
+ /usr/X11R6/lib/X11/locale/ja/XLC_LOCALE (or equivalent).
+ 
+ *** lib/X11/locale/ja/XLC_LOCALE.dist	Mon Aug  4 16:44:48 1997
+ --- lib/X11/locale/ja/XLC_LOCALE	Wed Oct  8 01:28:00 1997
+ ***************
+ *** 35,40 ****
+ --- 35,41 ----
+   	}
+   	font	{
+   		primary		JISX0201.1976-0:GR
+ + 		substitute	JISX0201.1976-0:GR
+   		vertical_rotate	all
+   	}
+   }
*** pkg/PLIST.dist	Tue Mar  4 18:38:57 1997
--- pkg/PLIST	Wed Oct  8 01:10:13 1997
***************
*** 34,42 ****
--- 34,44 ----
  lib/X11/fvwm2/pixmaps/arrows2.xpm
  lib/X11/fvwm2/pixmaps/arrup2.xpm
  lib/X11/fvwm2/pixmaps/bomb.xpm
+ lib/X11/fvwm2/pixmaps/ccode.icon
  lib/X11/fvwm2/pixmaps/clamp.xpm
  lib/X11/fvwm2/pixmaps/colormap.xpm
  lib/X11/fvwm2/pixmaps/datebook.xpm
+ lib/X11/fvwm2/pixmaps/default.xbm
  lib/X11/fvwm2/pixmaps/desk.xpm
  lib/X11/fvwm2/pixmaps/dialog_box.xpm
  lib/X11/fvwm2/pixmaps/doomface.xpm
***************
*** 46,57 ****
--- 48,61 ----
  lib/X11/fvwm2/pixmaps/flow_chart.xpm
  lib/X11/fvwm2/pixmaps/folder2.xpm
  lib/X11/fvwm2/pixmaps/folders.xpm
+ lib/X11/fvwm2/pixmaps/fvwm.bitmap
  lib/X11/fvwm2/pixmaps/fvwm.xpm
  lib/X11/fvwm2/pixmaps/fvwm2.xpm
  lib/X11/fvwm2/pixmaps/fvwm2_big.xpm
  lib/X11/fvwm2/pixmaps/fvwm3.xpm
  lib/X11/fvwm2/pixmaps/gnu-animal.xpm
  lib/X11/fvwm2/pixmaps/graphs.xpm
+ lib/X11/fvwm2/pixmaps/hcode.icon
  lib/X11/fvwm2/pixmaps/jball.xpm
  lib/X11/fvwm2/pixmaps/jbomb.xpm
  lib/X11/fvwm2/pixmaps/jbook1.xpm
***************
*** 99,107 ****
--- 103,115 ----
  lib/X11/fvwm2/pixmaps/mini.raise.xpm
  lib/X11/fvwm2/pixmaps/mini.refresh.xpm
  lib/X11/fvwm2/pixmaps/mini.resize.xpm
+ lib/X11/fvwm2/pixmaps/mini.resize2.xpm
  lib/X11/fvwm2/pixmaps/mini.stick.xpm
  lib/X11/fvwm2/pixmaps/mini.stick2.xpm
  lib/X11/fvwm2/pixmaps/mini.stickpressed.xpm
+ lib/X11/fvwm2/pixmaps/mini.winXX-close.xpm
+ lib/X11/fvwm2/pixmaps/mini.winXX-maximize.xpm
+ lib/X11/fvwm2/pixmaps/mini.winXX-minimize.xpm
  lib/X11/fvwm2/pixmaps/mini.xarchie.xpm
  lib/X11/fvwm2/pixmaps/mini.xbiff.xpm
  lib/X11/fvwm2/pixmaps/mini.xboing.xpm
***************
*** 112,119 ****
--- 120,129 ----
  lib/X11/fvwm2/pixmaps/mini.xpm
  lib/X11/fvwm2/pixmaps/mini.xterm.xpm
  lib/X11/fvwm2/pixmaps/mini.zircon.xpm
+ lib/X11/fvwm2/pixmaps/ocode.icon
  lib/X11/fvwm2/pixmaps/page.xpm
  lib/X11/fvwm2/pixmaps/page2.xpm
+ lib/X11/fvwm2/pixmaps/prog.icon
  lib/X11/fvwm2/pixmaps/ps.xpm
  lib/X11/fvwm2/pixmaps/question.xpm
  lib/X11/fvwm2/pixmaps/rbomb.xpm
>Audit-Trail:
>Unformatted:



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