diff options
| -rw-r--r-- | x11-wm/afterstep-stable/Makefile | 10 | ||||
| -rw-r--r-- | x11-wm/afterstep-stable/distinfo | 2 | ||||
| -rw-r--r-- | x11-wm/afterstep/Makefile | 10 | ||||
| -rw-r--r-- | x11-wm/afterstep/distinfo | 2 | ||||
| -rw-r--r-- | x11-wm/afterstep/files/patch-aa | 89 |
5 files changed, 42 insertions, 71 deletions
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile index 95ba9bd79716..6c319bc9b325 100644 --- a/x11-wm/afterstep-stable/Makefile +++ b/x11-wm/afterstep-stable/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: afterstep -# Version required: 0.98b19 +# Version required: 0.98b23a # Date created: 17 July 96 # Whom: james@bdd.net # -# $Id: Makefile,v 1.3 1996/08/07 02:29:48 asami Exp $ +# $Id: Makefile,v 1.4 1996/08/10 01:16:36 jfitz Exp $ # -DISTNAME= as-b19 -PKGNAME= afterstep-0.98b19 +DISTNAME= as-b23a +PKGNAME= afterstep-0.98b23a CATEGORIES+= x11 MASTER_SITES= ftp://oak.sfasu.edu/pub/AfterStep/ @@ -17,7 +17,7 @@ LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm RUN_DEPENDS= fvwm:${PORTSDIR}/x11/fvwm USE_X11= yes -WRKSRC= ${WRKDIR}/AfterStep-0.98aBETA19 +WRKSRC= ${WRKDIR}/AfterStep-0.98aBETA23a pre-build: @cd ${WRKSRC}; sh MakeMakefiles diff --git a/x11-wm/afterstep-stable/distinfo b/x11-wm/afterstep-stable/distinfo index 756ffea18540..d18a64a6cdb1 100644 --- a/x11-wm/afterstep-stable/distinfo +++ b/x11-wm/afterstep-stable/distinfo @@ -1 +1 @@ -MD5 (as-b19.tar.gz) = 3fe824a1cdd52d8738778e3abc5a99ec +MD5 (as-b23a.tar.gz) = 4a42558b306fb22dc2155559feb8e5e4 diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile index 95ba9bd79716..6c319bc9b325 100644 --- a/x11-wm/afterstep/Makefile +++ b/x11-wm/afterstep/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: afterstep -# Version required: 0.98b19 +# Version required: 0.98b23a # Date created: 17 July 96 # Whom: james@bdd.net # -# $Id: Makefile,v 1.3 1996/08/07 02:29:48 asami Exp $ +# $Id: Makefile,v 1.4 1996/08/10 01:16:36 jfitz Exp $ # -DISTNAME= as-b19 -PKGNAME= afterstep-0.98b19 +DISTNAME= as-b23a +PKGNAME= afterstep-0.98b23a CATEGORIES+= x11 MASTER_SITES= ftp://oak.sfasu.edu/pub/AfterStep/ @@ -17,7 +17,7 @@ LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm RUN_DEPENDS= fvwm:${PORTSDIR}/x11/fvwm USE_X11= yes -WRKSRC= ${WRKDIR}/AfterStep-0.98aBETA19 +WRKSRC= ${WRKDIR}/AfterStep-0.98aBETA23a pre-build: @cd ${WRKSRC}; sh MakeMakefiles diff --git a/x11-wm/afterstep/distinfo b/x11-wm/afterstep/distinfo index 756ffea18540..d18a64a6cdb1 100644 --- a/x11-wm/afterstep/distinfo +++ b/x11-wm/afterstep/distinfo @@ -1 +1 @@ -MD5 (as-b19.tar.gz) = 3fe824a1cdd52d8738778e3abc5a99ec +MD5 (as-b23a.tar.gz) = 4a42558b306fb22dc2155559feb8e5e4 diff --git a/x11-wm/afterstep/files/patch-aa b/x11-wm/afterstep/files/patch-aa index bfe2ad0bf397..28eddeadacf2 100644 --- a/x11-wm/afterstep/files/patch-aa +++ b/x11-wm/afterstep/files/patch-aa @@ -1,59 +1,30 @@ -*** configure.h.orig Wed Jul 17 10:35:47 1996 ---- configure.h Wed Jul 17 10:36:27 1996 -*************** -*** 1,10 **** -! #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" - - /* Imake command needed to put modules in desired target location */ - /* Use the second version if it causes grief */ -! #define TARGET_DIR BINDIR=AFTERDIR - /* #define TARGET_DIR*/ - - ---- 1,10 ---- -! #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" - - /* Imake command needed to put modules in desired target location */ - /* Use the second version if it causes grief */ -! #define TARGET_DIR BINDIR=AFTERDIR - /* #define TARGET_DIR*/ - - -*************** -*** 12,18 **** - * 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 */ ---- 12,18 ---- - * 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 */ -*************** -*** 54,60 **** - ***************************************************************************/ - #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 ---- 54,60 ---- - ***************************************************************************/ - #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 Sat Aug 17 00:50:55 1996 ++++ configure.h Sat Aug 17 00:53:36 1996 +@@ -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/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 +@@ -15,7 +15,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 */ +@@ -57,7 +57,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 -lm ++#define XPMLIBRARY -L@@PREFIX@@/lib -lXpm -lm + + /*************************************************************************** + *#define M4 |