diff options
author | asami <asami@FreeBSD.org> | 1996-05-27 10:05:39 +0800 |
---|---|---|
committer | asami <asami@FreeBSD.org> | 1996-05-27 10:05:39 +0800 |
commit | 8b75b215c4c61a6a98a6ed85712c0e1842de4d90 (patch) | |
tree | 2511e38a697ab15fc2336b181959653b9a2d7ac6 /x11-wm | |
parent | 9d468e5f382d96c4559ce7f1723b745fca65af7f (diff) | |
download | freebsd-ports-gnome-8b75b215c4c61a6a98a6ed85712c0e1842de4d90.tar.gz freebsd-ports-gnome-8b75b215c4c61a6a98a6ed85712c0e1842de4d90.tar.zst freebsd-ports-gnome-8b75b215c4c61a6a98a6ed85712c0e1842de4d90.zip |
Upgrade, 2.0.41c -> 2.0.41f.
Submitted by: Andreas Klemm <andreas@knobel.gun.de>
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/fvwm95-i18n/Makefile | 10 | ||||
-rw-r--r-- | x11-wm/fvwm95-i18n/distinfo | 2 | ||||
-rw-r--r-- | x11-wm/fvwm95-i18n/files/patch-ad | 22 | ||||
-rw-r--r-- | x11-wm/fvwm95-i18n/files/patch-ae | 22 | ||||
-rw-r--r-- | x11-wm/fvwm95/Makefile | 10 | ||||
-rw-r--r-- | x11-wm/fvwm95/distinfo | 2 | ||||
-rw-r--r-- | x11-wm/fvwm95/files/patch-ad | 22 | ||||
-rw-r--r-- | x11-wm/fvwm95/files/patch-ae | 22 |
8 files changed, 54 insertions, 58 deletions
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile index 0271b6ecd37b..e7d31d8f71bb 100644 --- a/x11-wm/fvwm95-i18n/Makefile +++ b/x11-wm/fvwm95-i18n/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: fvwm95-2 -# Version required: 2.0.41c +# Version required: 2.0.41f # Date created: Wed Apr 10 21:57:17 MET DST 1996 # Whom: Andreas Klemm <andreas@knobel.gun.de> # -# $Id: $ +# $Id: Makefile,v 1.1.1.1 1996/04/12 07:41:56 asami Exp $ # -DISTNAME= fvwm95-2.0.41c +DISTNAME= fvwm95-2.0.41f CATEGORIES+= x11 MASTER_SITES= ftp://mitac11.uia.ac.be/pub/ EXTRACT_SUFX= .tgz @@ -19,8 +19,8 @@ USE_IMAKE= yes #XMKMF= xmkmf #ALL_TARGET= Makefiles all -post-configure: - @ln ${WRKSRC}/fvwm/fvwm2.man ${WRKSRC}/fvwm/fvwm95-2.man +#post-configure: +# @ln ${WRKSRC}/fvwm/fvwm2.man ${WRKSRC}/fvwm/fvwm95-2.man post-install: @echo "installing default system.fvwmrc file..." diff --git a/x11-wm/fvwm95-i18n/distinfo b/x11-wm/fvwm95-i18n/distinfo index 5c9be9c63af0..5f9853373c62 100644 --- a/x11-wm/fvwm95-i18n/distinfo +++ b/x11-wm/fvwm95-i18n/distinfo @@ -1 +1 @@ -MD5 (fvwm95-2.0.41c.tgz) = fbc15fea6844afb6bbe8882dac8a19f1 +MD5 (fvwm95-2.0.41f.tgz) = d0ce2333380f5a9d2a50fb651ab86962 diff --git a/x11-wm/fvwm95-i18n/files/patch-ad b/x11-wm/fvwm95-i18n/files/patch-ad index d58229a2235c..548d2519ef24 100644 --- a/x11-wm/fvwm95-i18n/files/patch-ad +++ b/x11-wm/fvwm95-i18n/files/patch-ad @@ -1,15 +1,13 @@ ---- sample.fvwmrc/system.fvwmrc.orig Wed Apr 10 18:03:50 1996 -+++ sample.fvwmrc/system.fvwmrc Wed Apr 10 18:05:44 1996 -@@ -35,9 +35,9 @@ - IconFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* - EdgeScroll 100 100 - --ModulePath /usr/lib/X11/fvwm2 --PixmapPath /usr/include/X11/pixmaps/ --IconPath /usr/include/X11/bitmaps/ -+ModulePath /usr/X11R6/lib/X11/fvwm95-2/ +--- sample.fvwmrc/system.fvwm2rc95.orig Sun May 19 23:53:55 1996 ++++ sample.fvwmrc/system.fvwm2rc95 Sat May 25 21:04:42 1996 +@@ -83,8 +83,8 @@ + # ModulePath is a colon-separated list, just like regular unix PATH + # + ModulePath /usr/X11R6/lib/X11/fvwm95-2/ +-PixmapPath /usr/include/X11/pixmaps/:/usr/local/mini-icons/ +-IconPath /usr/include/X11/bitmaps/:/usr/local/icons/ +PixmapPath /usr/X11R6/include/X11/pixmaps/ +IconPath /usr/X11R6/include/X11/bitmaps/ - HilightColor black palevioletred - DeskTopSize 2x2 + #========================================================================# + diff --git a/x11-wm/fvwm95-i18n/files/patch-ae b/x11-wm/fvwm95-i18n/files/patch-ae index 1208b55afb0c..6c26334b13db 100644 --- a/x11-wm/fvwm95-i18n/files/patch-ae +++ b/x11-wm/fvwm95-i18n/files/patch-ae @@ -1,15 +1,15 @@ ---- Fvwm.tmpl.orig Wed Apr 10 18:07:34 1996 -+++ Fvwm.tmpl Wed Apr 10 18:14:16 1996 -@@ -29,7 +29,7 @@ - * confused. +--- Fvwm.tmpl.orig Sat May 25 21:09:38 1996 ++++ Fvwm.tmpl Sat May 25 21:12:21 1996 +@@ -30,6 +30,8 @@ ***************************************************************************/ --/* #define FvwmIconPath /usr/include/X11/bitmaps\:/usr/include/X11/pixmaps */ -+#define FvwmIconPath /usr/X11R6/lib/X11/fvwm95-2/mini-icons\:/usr/X11R6/lib/X11/fvwm95-2/icons\:/usr/X11R6/include/X11/pixmaps\:/usr/X11R6/include/X11/bitmaps + /* #define FvwmIconPath /usr/include/X11/bitmaps\:/usr/include/X11/pixmaps */ ++#define FvwmIconPath /usr/X11R6/lib/X11/fvwm95-2/mini-icons\:/usr/X11R6/lib/X11 ++/fvwm95-2/icons\:/usr/X11R6/include/X11/pixmaps\:/usr/X11R6/include/X11/bitmaps /*************************************************************************** -@@ -80,7 +80,7 @@ +@@ -80,7 +82,7 @@ * Set this to YES if you would like the programs in the utils directory * installed. *************************************************************************/ @@ -18,19 +18,19 @@ /************************************************************************** -@@ -142,17 +142,17 @@ +@@ -149,17 +151,17 @@ ***************************************************************************/ /* Where do you want the fvwm binaries installed. */ --#define FvwmBinDir /usr/local/X11R6/bin +-/* #define FvwmBinDir /usr/local/X11R6/bin */ +#define FvwmBinDir /usr/X11R6/bin /* Where do you want the fvwm modules installed. */ --#define FvwmDir /usr/local/X11R6/lib/X11/fvwm95-2 +-/* #define FvwmDir /usr/local/X11R6/lib/X11/fvwm95-2 */ +#define FvwmDir /usr/X11R6/lib/X11/fvwm95-2 /* Where do you want the fvwm libraries installed. */ --#define FvwmLibDir /usr/local/X11R6/lib +-/* #define FvwmLibDir /usr/local/X11R6/lib */ +#define FvwmLibDir /usr/X11R6/lib /* Where do you want the fvwm man pages installed. */ diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile index 0271b6ecd37b..e7d31d8f71bb 100644 --- a/x11-wm/fvwm95/Makefile +++ b/x11-wm/fvwm95/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: fvwm95-2 -# Version required: 2.0.41c +# Version required: 2.0.41f # Date created: Wed Apr 10 21:57:17 MET DST 1996 # Whom: Andreas Klemm <andreas@knobel.gun.de> # -# $Id: $ +# $Id: Makefile,v 1.1.1.1 1996/04/12 07:41:56 asami Exp $ # -DISTNAME= fvwm95-2.0.41c +DISTNAME= fvwm95-2.0.41f CATEGORIES+= x11 MASTER_SITES= ftp://mitac11.uia.ac.be/pub/ EXTRACT_SUFX= .tgz @@ -19,8 +19,8 @@ USE_IMAKE= yes #XMKMF= xmkmf #ALL_TARGET= Makefiles all -post-configure: - @ln ${WRKSRC}/fvwm/fvwm2.man ${WRKSRC}/fvwm/fvwm95-2.man +#post-configure: +# @ln ${WRKSRC}/fvwm/fvwm2.man ${WRKSRC}/fvwm/fvwm95-2.man post-install: @echo "installing default system.fvwmrc file..." diff --git a/x11-wm/fvwm95/distinfo b/x11-wm/fvwm95/distinfo index 5c9be9c63af0..5f9853373c62 100644 --- a/x11-wm/fvwm95/distinfo +++ b/x11-wm/fvwm95/distinfo @@ -1 +1 @@ -MD5 (fvwm95-2.0.41c.tgz) = fbc15fea6844afb6bbe8882dac8a19f1 +MD5 (fvwm95-2.0.41f.tgz) = d0ce2333380f5a9d2a50fb651ab86962 diff --git a/x11-wm/fvwm95/files/patch-ad b/x11-wm/fvwm95/files/patch-ad index d58229a2235c..548d2519ef24 100644 --- a/x11-wm/fvwm95/files/patch-ad +++ b/x11-wm/fvwm95/files/patch-ad @@ -1,15 +1,13 @@ ---- sample.fvwmrc/system.fvwmrc.orig Wed Apr 10 18:03:50 1996 -+++ sample.fvwmrc/system.fvwmrc Wed Apr 10 18:05:44 1996 -@@ -35,9 +35,9 @@ - IconFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* - EdgeScroll 100 100 - --ModulePath /usr/lib/X11/fvwm2 --PixmapPath /usr/include/X11/pixmaps/ --IconPath /usr/include/X11/bitmaps/ -+ModulePath /usr/X11R6/lib/X11/fvwm95-2/ +--- sample.fvwmrc/system.fvwm2rc95.orig Sun May 19 23:53:55 1996 ++++ sample.fvwmrc/system.fvwm2rc95 Sat May 25 21:04:42 1996 +@@ -83,8 +83,8 @@ + # ModulePath is a colon-separated list, just like regular unix PATH + # + ModulePath /usr/X11R6/lib/X11/fvwm95-2/ +-PixmapPath /usr/include/X11/pixmaps/:/usr/local/mini-icons/ +-IconPath /usr/include/X11/bitmaps/:/usr/local/icons/ +PixmapPath /usr/X11R6/include/X11/pixmaps/ +IconPath /usr/X11R6/include/X11/bitmaps/ - HilightColor black palevioletred - DeskTopSize 2x2 + #========================================================================# + diff --git a/x11-wm/fvwm95/files/patch-ae b/x11-wm/fvwm95/files/patch-ae index 1208b55afb0c..6c26334b13db 100644 --- a/x11-wm/fvwm95/files/patch-ae +++ b/x11-wm/fvwm95/files/patch-ae @@ -1,15 +1,15 @@ ---- Fvwm.tmpl.orig Wed Apr 10 18:07:34 1996 -+++ Fvwm.tmpl Wed Apr 10 18:14:16 1996 -@@ -29,7 +29,7 @@ - * confused. +--- Fvwm.tmpl.orig Sat May 25 21:09:38 1996 ++++ Fvwm.tmpl Sat May 25 21:12:21 1996 +@@ -30,6 +30,8 @@ ***************************************************************************/ --/* #define FvwmIconPath /usr/include/X11/bitmaps\:/usr/include/X11/pixmaps */ -+#define FvwmIconPath /usr/X11R6/lib/X11/fvwm95-2/mini-icons\:/usr/X11R6/lib/X11/fvwm95-2/icons\:/usr/X11R6/include/X11/pixmaps\:/usr/X11R6/include/X11/bitmaps + /* #define FvwmIconPath /usr/include/X11/bitmaps\:/usr/include/X11/pixmaps */ ++#define FvwmIconPath /usr/X11R6/lib/X11/fvwm95-2/mini-icons\:/usr/X11R6/lib/X11 ++/fvwm95-2/icons\:/usr/X11R6/include/X11/pixmaps\:/usr/X11R6/include/X11/bitmaps /*************************************************************************** -@@ -80,7 +80,7 @@ +@@ -80,7 +82,7 @@ * Set this to YES if you would like the programs in the utils directory * installed. *************************************************************************/ @@ -18,19 +18,19 @@ /************************************************************************** -@@ -142,17 +142,17 @@ +@@ -149,17 +151,17 @@ ***************************************************************************/ /* Where do you want the fvwm binaries installed. */ --#define FvwmBinDir /usr/local/X11R6/bin +-/* #define FvwmBinDir /usr/local/X11R6/bin */ +#define FvwmBinDir /usr/X11R6/bin /* Where do you want the fvwm modules installed. */ --#define FvwmDir /usr/local/X11R6/lib/X11/fvwm95-2 +-/* #define FvwmDir /usr/local/X11R6/lib/X11/fvwm95-2 */ +#define FvwmDir /usr/X11R6/lib/X11/fvwm95-2 /* Where do you want the fvwm libraries installed. */ --#define FvwmLibDir /usr/local/X11R6/lib +-/* #define FvwmLibDir /usr/local/X11R6/lib */ +#define FvwmLibDir /usr/X11R6/lib /* Where do you want the fvwm man pages installed. */ |