Date: Sat, 21 Jan 2017 16:47:19 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432058 - head/x11-wm/afterstep/files Message-ID: <201701211647.v0LGlJMf026514@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Sat Jan 21 16:47:19 2017 New Revision: 432058 URL: https://svnweb.freebsd.org/changeset/ports/432058 Log: - fix a possible problem if PREFIX differs from LOCALBASE Modified: head/x11-wm/afterstep/files/patch-Imakefile head/x11-wm/afterstep/files/patch-alpha_header.h head/x11-wm/afterstep/files/patch-configure.h head/x11-wm/afterstep/files/patch-icons.c head/x11-wm/afterstep/files/patch-sample.steprc Modified: head/x11-wm/afterstep/files/patch-Imakefile ============================================================================== --- head/x11-wm/afterstep/files/patch-Imakefile Sat Jan 21 16:38:06 2017 (r432057) +++ head/x11-wm/afterstep/files/patch-Imakefile Sat Jan 21 16:47:19 2017 (r432058) @@ -1,6 +1,6 @@ ---- Imakefile.orig Sun Mar 9 07:03:27 1997 -+++ Imakefile Sun Aug 25 18:27:44 2002 -@@ -18,7 +18,6 @@ +--- Imakefile.orig 1997-03-09 14:03:27 UTC ++++ Imakefile +@@ -18,7 +18,6 @@ ALLSUBDIRS = lib \ modules/Wharf \ modules/Banner \ modules/Pager \ @@ -8,7 +8,7 @@ modules/Animate SUBDIRS = $(ALLSUBDIRS) $(XPMSUBDIRS) $(SHAPESUBDIRS) -@@ -28,4 +27,4 @@ +@@ -28,4 +27,4 @@ SUBDIRS = $(ALLSUBDIRS) $(XPMSUBDIRS) $( MakeSubdirs($(SUBDIRS)) /* Doesn't work for me! */ Modified: head/x11-wm/afterstep/files/patch-alpha_header.h ============================================================================== --- head/x11-wm/afterstep/files/patch-alpha_header.h Sat Jan 21 16:38:06 2017 (r432057) +++ head/x11-wm/afterstep/files/patch-alpha_header.h Sat Jan 21 16:47:19 2017 (r432058) @@ -1,5 +1,5 @@ ---- afterstep/alpha_header.h.orig Thu Aug 22 20:48:18 1996 -+++ afterstep/alpha_header.h Mon Sep 13 14:35:09 2004 +--- afterstep/alpha_header.h.orig 1996-08-22 20:48:18 UTC ++++ afterstep/alpha_header.h @@ -7,11 +7,6 @@ extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *); Modified: head/x11-wm/afterstep/files/patch-configure.h ============================================================================== --- head/x11-wm/afterstep/files/patch-configure.h Sat Jan 21 16:38:06 2017 (r432057) +++ head/x11-wm/afterstep/files/patch-configure.h Sat Jan 21 16:47:19 2017 (r432058) @@ -1,51 +1,30 @@ -*** configure.h.orig Sun Mar 2 11:50:40 1997 ---- configure.h Thu Mar 20 21:31:42 1997 -*************** -*** 1,6 **** -! #define AFTERDIR "/usr/lib/X11/afterstep" -! #define AFTER_ICONDIR "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps" -! #define STEPRC "/usr/lib/X11/afterstep/system.steprc" - - /* If you would like gradients, uncomment this */ - #define ENABLE_TEXTURE ---- 1,6 ---- -! #define AFTERDIR "%%PREFIX%%/lib/X11/afterstep" -! #define AFTER_ICONDIR "%%PREFIX%%/include/X11/bitmaps:%%PREFIX%%/include/X11/pixmaps" -! #define STEPRC "%%PREFIX%%/lib/X11/afterstep/system.steprc" - - /* If you would like gradients, uncomment this */ - #define ENABLE_TEXTURE -*************** -*** 17,23 **** - * Imake wants to leave binaries, then choose the second line here. - * If you want to install it in a different directory, uncomment and - * edit the first line */ -! #define AFTER_BIN_DIR BINDIR=/usr/bin/X11 - - /* Compiler over-ride for Imakefiles */ - /* Leave it as shown to get your default compiler */ ---- 17,23 ---- - * Imake wants to leave binaries, then choose the second line here. - * If you want to install it in a different directory, uncomment and - * edit the first line */ -! #define AFTER_BIN_DIR BINDIR=%%PREFIX%%/bin - - /* Compiler over-ride for Imakefiles */ - /* Leave it as shown to get your default compiler */ -*************** -*** 59,65 **** - ***************************************************************************/ - #define XPM - /* linker flags needed to locate and link in the Xpm library, if you use it */ -! #define XPMLIBRARY -L/usr/lib/X11 -lXpm - - /*************************************************************************** - *#define M4 ---- 59,65 ---- - ***************************************************************************/ - #define XPM - /* linker flags needed to locate and link in the Xpm library, if you use it */ -! #define XPMLIBRARY -L%%PREFIX%%/lib -lXpm - - /*************************************************************************** - *#define M4 +--- configure.h.orig 1997-03-02 19:50:40 UTC ++++ configure.h +@@ -1,6 +1,6 @@ +-#define AFTERDIR "/usr/lib/X11/afterstep" +-#define AFTER_ICONDIR "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps" +-#define STEPRC "/usr/lib/X11/afterstep/system.steprc" ++#define AFTERDIR "%%PREFIX%%/lib/X11/afterstep" ++#define AFTER_ICONDIR "%%PREFIX%%/include/X11/bitmaps:%%PREFIX%%/include/X11/pixmaps" ++#define STEPRC "%%PREFIX%%/lib/X11/afterstep/system.steprc" + + /* If you would like gradients, uncomment this */ + #define ENABLE_TEXTURE +@@ -17,7 +17,7 @@ + * Imake wants to leave binaries, then choose the second line here. + * If you want to install it in a different directory, uncomment and + * edit the first line */ +-#define AFTER_BIN_DIR BINDIR=/usr/bin/X11 ++#define AFTER_BIN_DIR BINDIR=%%PREFIX%%/bin + + /* Compiler over-ride for Imakefiles */ + /* Leave it as shown to get your default compiler */ +@@ -59,7 +59,7 @@ + ***************************************************************************/ + #define XPM + /* linker flags needed to locate and link in the Xpm library, if you use it */ +-#define XPMLIBRARY -L/usr/lib/X11 -lXpm ++#define XPMLIBRARY -L%%LOCALBASE%%/lib -lXpm + + /*************************************************************************** + *#define M4 Modified: head/x11-wm/afterstep/files/patch-icons.c ============================================================================== --- head/x11-wm/afterstep/files/patch-icons.c Sat Jan 21 16:38:06 2017 (r432057) +++ head/x11-wm/afterstep/files/patch-icons.c Sat Jan 21 16:47:19 2017 (r432058) @@ -1,6 +1,6 @@ ---- afterstep/icons.c.orig Thu Mar 20 19:09:21 1997 -+++ afterstep/icons.c Sun May 26 18:15:10 2002 -@@ -779,10 +779,12 @@ +--- afterstep/icons.c.orig 1997-03-21 00:09:21 UTC ++++ afterstep/icons.c +@@ -779,10 +779,12 @@ void Iconify(ASWindow *tmp_win, int def_ } } Modified: head/x11-wm/afterstep/files/patch-sample.steprc ============================================================================== --- head/x11-wm/afterstep/files/patch-sample.steprc Sat Jan 21 16:38:06 2017 (r432057) +++ head/x11-wm/afterstep/files/patch-sample.steprc Sat Jan 21 16:47:19 2017 (r432058) @@ -1,112 +1,76 @@ -*** sample.steprc.orig Sun Mar 9 06:30:22 1997 ---- sample.steprc Thu Mar 20 21:37:46 1997 -*************** -*** 166,176 **** - # ModulePath is a colon-separated list, just like a regular unix PATH - # Any Module must be found within the path in order to be located - # and executed -! ModulePath /usr/lib/X11/afterstep:/usr/X11R6/lib/X11/afterstep - # Another colon-separated list pointing to your pixmaps (color icons) -! PixmapPath /usr/include/X11/pixmaps/ - # Path for your ugly black&white icons -! IconPath /usr/include/X11/bitmaps/ - - # Various styles which can be associated with specific applications - # Sticky -- remains "stuck" on all desks ---- 166,176 ---- - # ModulePath is a colon-separated list, just like a regular unix PATH - # Any Module must be found within the path in order to be located - # and executed -! ModulePath %%PREFIX%%/lib/X11/afterstep - # Another colon-separated list pointing to your pixmaps (color icons) -! PixmapPath %%PREFIX%%/include/X11/pixmaps/ - # Path for your ugly black&white icons -! IconPath %%PREFIX%%/include/X11/bitmaps/ - - # Various styles which can be associated with specific applications - # Sticky -- remains "stuck" on all desks -*************** -*** 290,296 **** - # Place the green carpet image onto the background upon startup - # I personally recommend xli/xloadimage, but xv seems to be - # ubiquitous in the unix world so I'll use that -! # Exec "I" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/carpet.green.jpg - Exec "I" exec xsetroot -solid DarkGrey - EndFunction - ---- 290,296 ---- - # Place the green carpet image onto the background upon startup - # I personally recommend xli/xloadimage, but xv seems to be - # ubiquitous in the unix world so I'll use that -! # Exec "I" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/carpet.green.jpg - Exec "I" exec xsetroot -solid DarkGrey - EndFunction - -*************** -*** 465,485 **** - # Images ... quick way to view the included default background images - Popup "Images" - Title "Images" -! Exec "Brick" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/brick.jpg -! Exec "Coins" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/coins.jpg -! Exec "Dark Wood" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/darkwood.jpg -! Exec "Eyes" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/eyes.jpg -! Exec "Glass" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/glass.jpg -! Exec "Green Carpet" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/carpet.green.jpg -! Exec "Parquet" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/parquet.jpg -! Exec "Pebbles" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/pebbles.jpg -! Exec "Rock" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/rock.tile.jpg -! Exec "Rope" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/rope.weave.jpg -! Exec "Stucco" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/stucco.jpg -! Exec "Tile" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/tile.check.jpg -! Exec "Tree Bark" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/bark.jpg -! Exec "Volcanic" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/volcanic.jpg -! Exec "Wood" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/wood.jpg - EndPopup - - # Background settings ... choose from either Solid Colors or Color Images ---- 465,485 ---- - # Images ... quick way to view the included default background images - Popup "Images" - Title "Images" -! Exec "Brick" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/brick.jpg -! Exec "Coins" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/coins.jpg -! Exec "Dark Wood" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/darkwood.jpg -! Exec "Eyes" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/eyes.jpg -! Exec "Glass" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/glass.jpg -! Exec "Green Carpet" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/carpet.green.jpg -! Exec "Parquet" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/parquet.jpg -! Exec "Pebbles" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/pebbles.jpg -! Exec "Rock" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/rock.tile.jpg -! Exec "Rope" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/rope.weave.jpg -! Exec "Stucco" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/stucco.jpg -! Exec "Tile" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/tile.check.jpg -! Exec "Tree Bark" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/bark.jpg -! Exec "Volcanic" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/volcanic.jpg -! Exec "Wood" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/wood.jpg - EndPopup - - # Background settings ... choose from either Solid Colors or Color Images -*************** -*** 605,614 **** - Module Audio - - # Select your normal audio player -! #*AudioPlayCmd /usr/bin/showaudio - - # Select the directory containing your sounds -! #*AudioDir /home/frank/mac/sounds - - #*AudioDelay 1 - ---- 605,614 ---- - Module Audio - - # Select your normal audio player -! #*AudioPlayCmd /usr/local/bin/showaudio - - # Select the directory containing your sounds -! #*AudioDir %%PREFIX%%/lib/X11/afterstep/sounds - - #*AudioDelay 1 - +--- sample.steprc.orig 1997-05-04 15:28:05 UTC ++++ sample.steprc +@@ -167,11 +167,11 @@ DeskTopScale 32 + # ModulePath is a colon-separated list, just like a regular unix PATH + # Any Module must be found within the path in order to be located + # and executed +-ModulePath /usr/lib/X11/afterstep:/usr/X11R6/lib/X11/afterstep ++ModulePath %%PREFIX%%/lib/X11/afterstep + # Another colon-separated list pointing to your pixmaps (color icons) +-PixmapPath /usr/include/X11/pixmaps/ ++PixmapPath %%PREFIX%%/include/X11/pixmaps/ + # Path for your ugly black&white icons +-IconPath /usr/include/X11/bitmaps/ ++IconPath %%PREFIX%%/include/X11/bitmaps/ + + # Various styles which can be associated with specific applications + # Sticky -- remains "stuck" on all desks +@@ -291,7 +291,7 @@ Function "InitFunction" + # Place the green carpet image onto the background upon startup + # I personally recommend xli/xloadimage, but xv seems to be + # ubiquitous in the unix world so I'll use that +- # Exec "I" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/carpet.green.jpg ++ # Exec "I" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/carpet.green.jpg + Exec "I" exec xsetroot -solid DarkGrey + EndFunction + +@@ -466,21 +466,21 @@ EndPopup + # Images ... quick way to view the included default background images + Popup "Images" + Title "Images" +- Exec "Brick" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/brick.jpg +- Exec "Coins" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/coins.jpg +- Exec "Dark Wood" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/darkwood.jpg +- Exec "Eyes" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/eyes.jpg +- Exec "Glass" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/glass.jpg +- Exec "Green Carpet" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/carpet.green.jpg +- Exec "Parquet" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/parquet.jpg +- Exec "Pebbles" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/pebbles.jpg +- Exec "Rock" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/rock.tile.jpg +- Exec "Rope" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/rope.weave.jpg +- Exec "Stucco" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/stucco.jpg +- Exec "Tile" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/tile.check.jpg +- Exec "Tree Bark" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/bark.jpg +- Exec "Volcanic" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/volcanic.jpg +- Exec "Wood" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/wood.jpg ++ Exec "Brick" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/brick.jpg ++ Exec "Coins" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/coins.jpg ++ Exec "Dark Wood" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/darkwood.jpg ++ Exec "Eyes" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/eyes.jpg ++ Exec "Glass" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/glass.jpg ++ Exec "Green Carpet" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/carpet.green.jpg ++ Exec "Parquet" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/parquet.jpg ++ Exec "Pebbles" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/pebbles.jpg ++ Exec "Rock" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/rock.tile.jpg ++ Exec "Rope" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/rope.weave.jpg ++ Exec "Stucco" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/stucco.jpg ++ Exec "Tile" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/tile.check.jpg ++ Exec "Tree Bark" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/bark.jpg ++ Exec "Volcanic" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/volcanic.jpg ++ Exec "Wood" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/wood.jpg + EndPopup + + # Background settings ... choose from either Solid Colors or Color Images +@@ -606,10 +606,10 @@ Key Down A C Scroll + + Module Audio + + # Select your normal audio player +-#*AudioPlayCmd /usr/bin/showaudio ++#*AudioPlayCmd %%LOCALBASE%%/bin/showaudio + + # Select the directory containing your sounds +-#*AudioDir /home/frank/mac/sounds ++#*AudioDir %%PREFIX%%/lib/X11/afterstep/sounds + + #*AudioDelay 1 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701211647.v0LGlJMf026514>