head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.54 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.52 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.50 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.48 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.46 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.44 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.42 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.40 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.38 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.36 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.34 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.32 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.30 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.28 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.26 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.24 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.22 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.20 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.18 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.16 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.14 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.12 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.10 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.8 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.6 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.4 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 buildlink2-base:1.7 netbsd-1-5-RELEASE:1.6 netbsd-1-4-PATCH003:1.6 netbsd-1-4-PATCH002:1.6 comdex-fall-1999:1.5 netbsd-1-4-PATCH001:1.5 netbsd-1-4-RELEASE:1.5 netbsd-1-3-PATCH003:1.4 netbsd-1-3-PATCH002:1.1.1.1 FreeBSD-current-1997-10-28:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.7 date 2000.12.12.02.10.56; author wiz; state dead; branches; next 1.6; 1.6 date 99.11.01.09.02.05; author rh; state Exp; branches; next 1.5; 1.5 date 99.03.01.01.38.45; author hubertf; state Exp; branches; next 1.4; 1.4 date 98.09.16.19.01.58; author garbled; state Exp; branches; next 1.3; 1.3 date 98.08.18.21.46.43; author tron; state Exp; branches; next 1.2; 1.2 date 98.08.07.11.18.02; author agc; state Exp; branches; next 1.1; 1.1 date 97.11.10.00.50.49; author hubertf; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.11.10.00.50.49; author hubertf; state Exp; branches; next ; desc @@ 1.7 log @Added wm category to main Makefile; remove packages that have been moved from x11 to wm; fix paths in packages that depend on the moved ones. @ text @$NetBSD: patch-aa,v 1.6 1999/11/01 09:02:05 rh Exp $ --- utils/Makefile.in.orig Wed Jan 20 06:29:27 1999 +++ utils/Makefile.in Mon Feb 22 03:54:05 1999 @@@@ -83,10 +83,10 @@@@ xpm_CFLAGS = @@xpm_CFLAGS@@ xpm_LIBS = @@xpm_LIBS@@ -bin_PROGRAMS = @@XPMROOT@@ -EXTRA_PROGRAMS = xpmroot +#bin_PROGRAMS = @@XPMROOT@@ +#EXTRA_PROGRAMS = xpmroot -man_MANS = xpmroot.1 +#man_MANS = xpmroot.1 EXTRA_DIST = BuildXLockMenu fvwmrc_convert quantize_pixmaps $(man_MANS) LDADD = -L$(top_builddir)/libs -lfvwm $(xpm_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) @ 1.6 log @ * Add proper CONFIGURE_ARGS to pull in xpm, readline, and rplay in a deterministic fashion. This fixes PR 8392 by Michael South, thanks! * Add proper dependency on readline and rplay. * Add wildcard dependency on xpmroot. * Fix some pkglint woes. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Update to V2.2 @ text @d1 2 @ 1.4 log @Make this pkg work on alpha. The authors of this have earned a slightly less violent death. @ text @d1 14 a14 9 $NetBSD$ --- Fvwm.tmpl.orig Wed Sep 16 11:04:08 1998 +++ Fvwm.tmpl Wed Sep 16 11:17:31 1998 @@@@ -97,7 +97,7 @@@@ * Set this to YES if you would like the programs in the utils directory * installed. *************************************************************************/ -#define InstallUtils NO +#define InstallUtils YES d16 1 a16 42 /************************************************************************** @@@@ -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 */ +/* FreeBSD ports -- Assumes += notation is allowed */ +OPTION_DEFINES += -DENABLE_REMOTE_CHANGEDESKS +/* FreeBSD ports */ /*************************************************************************** * The following section only needs to be changed if you do not want @@@@ -388,7 +390,7 @@@@ #endif #ifndef FvwmIconPath -#define FvwmIconPath $(INCDIR)/bitmaps\:$(INCDIR)/pixmaps +#define FvwmIconPath $(FVWMDIR)/pixmaps\:$(INCDIR)/bitmaps\:$(INCDIR)/pixmaps #endif ICONPATH = FvwmIconPath @@@@ -397,7 +399,7 @@@@ /* take care of libs not correctly added by Imake on some systems */ /* #ifdef AlphaArchitecture */ -#if defined(AlphaArchitecture) && !defined(linux) +#if defined(AlphaArchitecture) && !defined(linux) && !defined(NetBSDArchitecture) KLUDGE_LIBS = -ldnet_stub #else #ifdef HPArchitecture @ 1.3 log @Add '-DFVWM_CPP=\"/usr/bin/cpp\"' to compile options to make "FvwmCpp" module work and clean up patches. Fixes PR pkg/5983. @ text @d1 3 a3 2 --- Fvwm.tmpl.orig Tue Aug 18 23:30:33 1998 +++ Fvwm.tmpl Tue Aug 18 23:35:15 1998 d44 9 @ 1.2 log @Add NetBSD RCS Ids. @ text @d1 2 a2 4 $NetBSD$ --- Fvwm.tmpl.dist Wed Jan 22 22:38:49 1997 +++ Fvwm.tmpl Thu Jan 30 15:27:41 1997 d12 13 a24 1 @@@@ -268,6 +268,9 @@@@ d34 1 a34 1 @@@@ -388,7 +391,7 @@@@ a42 66 --- 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 @ 1.1 log @Initial revision @ text @d1 2 @ 1.1.1.1 log @fvwm2 @ text @@