From da3e4d5603a88fd64405e346908cc1ffb7fdc47e Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 18 Aug 1998 21:46:43 +0000 Subject: Add '-DFVWM_CPP=\"/usr/bin/cpp\"' to compile options to make "FvwmCpp" module work and clean up patches. Fixes PR pkg/5983. --- x11/fvwm2/patches/patch-aa | 88 +++++++++------------------------------------- x11/fvwm2/patches/patch-ac | 88 +++++++++++++++++++++++++++++++++------------- x11/fvwm2/patches/patch-ad | 15 ++++++++ 3 files changed, 94 insertions(+), 97 deletions(-) create mode 100644 x11/fvwm2/patches/patch-ad (limited to 'x11') diff --git a/x11/fvwm2/patches/patch-aa b/x11/fvwm2/patches/patch-aa index f4aa2bf467b..49dd8878b63 100644 --- a/x11/fvwm2/patches/patch-aa +++ b/x11/fvwm2/patches/patch-aa @@ -1,7 +1,5 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 11:18:02 agc Exp $ - ---- Fvwm.tmpl.dist Wed Jan 22 22:38:49 1997 -+++ Fvwm.tmpl Thu Jan 30 15:27:41 1997 +--- Fvwm.tmpl.orig Tue Aug 18 23:30:33 1998 ++++ Fvwm.tmpl Tue Aug 18 23:35:15 1998 @@ -97,7 +97,7 @@ * Set this to YES if you would like the programs in the utils directory * installed. @@ -11,7 +9,19 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:18:02 agc Exp $ /************************************************************************** -@@ -268,6 +268,9 @@ +@@ -257,17 +257,19 @@ + OPTION_DEFINES += -DVECTOR_BUTTONS -DPIXMAP_BUTTONS -DGRADIENT_BUTTONS + OPTION_DEFINES += -DMULTISTYLE -DEXTENDED_TITLESTYLE + OPTION_DEFINES += -DBORDERSTYLE -DUSEDECOR -DWINDOWSHADE +- + #else + + /* the works, not using '+=': */ +-OPTION_DEFINES = -DSHAPE -DI18N -DACTIVEDOWN_BTNS -DINACTIVE_BTNS -DMINI_ICONS -DVECTOR_BUTTONS -DPIXMAP_BUTTONS -DGRADIENT_BUTTONS -DMULTISTYLE -DEXTENDED_TITLESTYLE -DBORDERSTYLE -DUSEDECOR -DWINDOWSHADE ++OPTION_DEFINES = -DSHAPE -DI18N -DACTIVEDOWN_BTNS -DINACTIVE_BTNS -DMINI_ICONS -DVECTOR_BUTTONS -DPIXMAP_BUTTONS -DGRADIENT_BUTTONS -DMULTISTYLE -DEXTENDED_TITLESTYLE -DBORDERSTYLE -DUSEDECOR -DWINDOWSHADE -DFVWM_CPP=\"/usr/bin/cpp\" + + #endif + /* Or if you prefer a more minimal setup, you could try something like: */ /* OPTION_DEFINES = -DSHAPE -DVECTOR_BUTTONS */ @@ -21,7 +31,7 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:18:02 agc Exp $ /*************************************************************************** * The following section only needs to be changed if you do not want -@@ -388,7 +391,7 @@ +@@ -388,7 +390,7 @@ #endif #ifndef FvwmIconPath @@ -30,69 +40,3 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:18:02 agc Exp $ #endif ICONPATH = FvwmIconPath ---- sample.fvwmrc/Imakefile.dist Thu Apr 25 23:23:35 1996 -+++ sample.fvwmrc/Imakefile Thu Jan 30 15:47:29 1997 -@@ -8,5 +8,12 @@ - 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)) -+InstallNonExecFile(system.fvwm2rc-sample-1,$(FVWMDIR)) -+InstallNonExecFile(system.fvwm2rc-sample-2,$(FVWMDIR)) -+/* FreeBSD ports */ - #endif ---- sample.fvwmrc/system.fvwm2rc.dist Thu Jan 16 05:29:42 1997 -+++ sample.fvwmrc/system.fvwm2rc Thu Jan 30 15:58:20 1997 -@@ -13,12 +13,12 @@ - ClickTime 750 - - # make sure these fonts exist on your system: --WindowFont -adobe-times-bold-r-*-*-18-*-*-*-*-*-*-* --IconFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* -+WindowFont -adobe-times-bold-r-*-*-18-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-18-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-18-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-18-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-18-*-*-*-*-*-*-* -+IconFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-10-*-*-*-*-*-*-* - - HilightColor black palevioletred - DeskTopSize 2x2 --MenuStyle maroon grey60 grey40 -adobe-times-bold-r-*-*-14-*-*-*-*-*-*-* fvwm -+MenuStyle maroon grey60 grey40 -adobe-times-bold-r-*-*-14-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-14-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-14-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-14-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-14-*-*-*-*-*-*-* fvwm - - ColormapFocus FollowsMouse - -@@ -289,12 +289,12 @@ - # Just choose colors and a fonts - *FvwmIdentBack MidnightBlue - *FvwmIdentFore Yellow --*FvwmIdentFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-* -+*FvwmIdentFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-12-*-*-*-*-*-*-* - - ########################### Pager ######################################### - *FvwmPagerBack #908090 - *FvwmPagerFore #484048 --*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* -+*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-10-*-*-*-*-*-*-* - *FvwmPagerHilight #cab3ca - *FvwmPagerGeometry -1-1 - *FvwmPagerLabel 0 Misc -@@ -306,7 +306,7 @@ - ##########################FvwmWinList################################## - *FvwmWinListBack #908090 - *FvwmWinListFore Black --*FvwmWinListFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* -+*FvwmWinListFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-10-*-*-*-*-*-*-* - *FvwmWinListAction Click1 Iconify -1,Focus - *FvwmWinListAction Click2 Iconify - *FvwmWinListAction Click3 Module "FvwmIdent" FvwmIdent -@@ -334,7 +334,7 @@ - #*FvwmIconBoxFore blue - *FvwmIconBoxGeometry 5x1+0+0 - *FvwmIconBoxMaxIconSize 64x38 --*FvwmIconBoxFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-* -+*FvwmIconBoxFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-12-*-*-*-*-*-*-* - *FvwmIconBoxSortIcons IconName - *FvwmIconBoxPadding 4 - *FvwmIconBoxLines 10 diff --git a/x11/fvwm2/patches/patch-ac b/x11/fvwm2/patches/patch-ac index bea601f724c..7dbd6ab54f7 100644 --- a/x11/fvwm2/patches/patch-ac +++ b/x11/fvwm2/patches/patch-ac @@ -1,25 +1,63 @@ -$NetBSD: patch-ac,v 1.2 1998/08/07 11:18:02 agc Exp $ - -*** sample.fvwmrc/system.fvwm2rc.dist Thu Jan 16 05:29:42 1997 ---- sample.fvwmrc/system.fvwm2rc Mon Mar 3 21:42:11 1997 -*************** -*** 4,12 **** - # fvwm web page (see the FAQ). - - # be sure to customize these paths for your installation: -! ModulePath /usr/lib/X11/fvwm2 -! PixmapPath /usr/include/X11/pixmaps -! IconPath /usr/include/X11/bitmaps - - EdgeResistance 250 10 - EdgeScroll 100 100 ---- 4,12 ---- - # fvwm web page (see the FAQ). - - # be sure to customize these paths for your installation: -! #ModulePath /usr/lib/X11/fvwm2 -! #PixmapPath /usr/include/X11/pixmaps -! #IconPath /usr/include/X11/bitmaps - - EdgeResistance 250 10 - EdgeScroll 100 100 +--- sample.fvwmrc/system.fvwm2rc.orig Tue Aug 18 23:27:13 1998 ++++ sample.fvwmrc/system.fvwm2rc Tue Aug 18 23:26:57 1998 +@@ -4,21 +4,21 @@ + # fvwm web page (see the FAQ). + + # be sure to customize these paths for your installation: +-ModulePath /usr/lib/X11/fvwm2 +-PixmapPath /usr/include/X11/pixmaps +-IconPath /usr/include/X11/bitmaps ++#ModulePath /usr/lib/X11/fvwm2 ++#PixmapPath /usr/include/X11/pixmaps ++#IconPath /usr/include/X11/bitmaps + + EdgeResistance 250 10 + EdgeScroll 100 100 + ClickTime 750 + + # make sure these fonts exist on your system: +-WindowFont -adobe-times-bold-r-*-*-18-*-*-*-*-*-*-* +-IconFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* ++WindowFont -adobe-times-bold-r-*-*-18-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-18-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-18-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-18-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-18-*-*-*-*-*-*-* ++IconFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-10-*-*-*-*-*-*-* + + HilightColor black palevioletred + DeskTopSize 2x2 +-MenuStyle maroon grey60 grey40 -adobe-times-bold-r-*-*-14-*-*-*-*-*-*-* fvwm ++MenuStyle maroon grey60 grey40 -adobe-times-bold-r-*-*-14-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-14-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-14-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-14-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-14-*-*-*-*-*-*-* fvwm + + ColormapFocus FollowsMouse + +@@ -289,12 +289,12 @@ + # Just choose colors and a fonts + *FvwmIdentBack MidnightBlue + *FvwmIdentFore Yellow +-*FvwmIdentFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-* ++*FvwmIdentFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-12-*-*-*-*-*-*-* + + ########################### Pager ######################################### + *FvwmPagerBack #908090 + *FvwmPagerFore #484048 +-*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* ++*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-10-*-*-*-*-*-*-* + *FvwmPagerHilight #cab3ca + *FvwmPagerGeometry -1-1 + *FvwmPagerLabel 0 Misc +@@ -306,7 +306,7 @@ + ##########################FvwmWinList################################## + *FvwmWinListBack #908090 + *FvwmWinListFore Black +-*FvwmWinListFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* ++*FvwmWinListFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-10-*-*-*-*-*-*-* + *FvwmWinListAction Click1 Iconify -1,Focus + *FvwmWinListAction Click2 Iconify + *FvwmWinListAction Click3 Module "FvwmIdent" FvwmIdent +@@ -334,7 +334,7 @@ + #*FvwmIconBoxFore blue + *FvwmIconBoxGeometry 5x1+0+0 + *FvwmIconBoxMaxIconSize 64x38 +-*FvwmIconBoxFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-* ++*FvwmIconBoxFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-12-*-*-*-*-*-*-* + *FvwmIconBoxSortIcons IconName + *FvwmIconBoxPadding 4 + *FvwmIconBoxLines 10 diff --git a/x11/fvwm2/patches/patch-ad b/x11/fvwm2/patches/patch-ad new file mode 100644 index 00000000000..5358f7d8349 --- /dev/null +++ b/x11/fvwm2/patches/patch-ad @@ -0,0 +1,15 @@ +--- sample.fvwmrc/Imakefile.dist Thu Apr 25 23:23:35 1996 ++++ sample.fvwmrc/Imakefile Thu Jan 30 15:47:29 1997 +@@ -8,5 +8,12 @@ + 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)) ++InstallNonExecFile(system.fvwm2rc-sample-1,$(FVWMDIR)) ++InstallNonExecFile(system.fvwm2rc-sample-2,$(FVWMDIR)) ++/* FreeBSD ports */ + #endif -- cgit v1.2.3