- Welcome X.org 7.2 \o/.

- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

2 files changed, 34 insertions, 13 deletions

diff --git a/x11-wm/blwm/Makefile b/x11-wm/blwm/Makefile
index eea6477ab494..f921330c1582 100644
--- a/x11-wm/blwm/Makefile
+++ b/x11-wm/blwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blwm
 PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm portuguese
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
@@ -17,30 +17,20 @@ COMMENT=	Portuguese derivative of qvwm, simplified to conserve resources
 
 RUN_DEPENDS=	xsetbg:${PORTSDIR}/x11/xloadimage
 
-USE_AUTOTOOLS=	automake:14 autoconf:213
 USE_PERL5_BUILD=yes
-GNU_CONFIGURE=	yes
 MAN1=		blwm.1x
 PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
+MAKEFILE=	Makefile.std
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 DOCS=		AUTHORS BUGS COPYING CREDITS FreeBSD INSTALAR LEIAME TODO
 
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-
-do-patch:
+post-patch:
 	${PERL} -pi -e "s:wmsetbg:xsetbg:g ; \
 		s:/usr/local/lib/blwm:${PREFIX}/lib/blwm:g" \
 		${WRKSRC}/rc/*
 
-pre-configure:
-	cd ${WRKSRC} && \
-		${ACLOCAL} && \
-		${AUTOHEADER} && \
-		${AUTOCONF} && \
-		${AUTOMAKE}
-
 pre-install:
 	${ECHO_CMD} bin/blwm > ${PLIST}
 .if !defined(NOPORTDOCS)
diff --git a/x11-wm/blwm/files/patch-Makefile.std b/x11-wm/blwm/files/patch-Makefile.std
new file mode 100644
index 000000000000..93729e357be3
--- /dev/null
+++ b/x11-wm/blwm/files/patch-Makefile.std
@@ -0,0 +1,31 @@
+--- Makefile.std.orig	Thu Mar 22 15:16:18 2007
++++ Makefile.std	Thu Mar 22 15:21:47 2007
+@@ -9,7 +9,7 @@
+ #
+ # Directory of X Window System
+ #
+-XDIR = /usr/X11R6
++XDIR = $(X11BASE)
+ 
+ #
+ # Directory where you install blwm binary
+@@ -127,7 +127,7 @@
+ #
+ INSTALL = install -c
+ #INSTALL = cp
+-MKDIRHIER = mkdirhier
++MKDIRHIER = $(MKDIR)
+ #MKDIRHIER = make -p
+ MV = mv
+ RM = rm -f
+@@ -138,7 +138,9 @@
+ SUBDIRS = src images man rc themes
+ 
+ MAKE = make
+-MFLAGS = BINDIR=$(BINDIR) CONFDIR=$(CONFDIR) MANDIR=$(MANDIR) MANSUFFIX=$(MANSUFFIX) INCDIR=$(INCDIR) LIBDIR=$(LIBDIR) BLWMDIR=$(BLWMDIR) IMGDIR=$(IMGDIR) PATH_RM=$(PATH_RM) CXX="$(CXX)" CXXDEFINES="$(CXXDEFINES)" YACC="$(YACC)" YFLAGS="$(YFLAGS)" LEX="$(LEX)" LEXLIB="$(LEXLIB)" XPG4_LIB=$(XPG4_LIB) IMAGE_LIBS=$(IMAGE_LIBS) INSTALL="$(INSTALL)" MKDIRHIER="$(MKDIRHIER)" MV="$(MV)" RM="$(RM)" -f Makefile.std
++MFLAGS = BINDIR=$(BINDIR) CONFDIR=$(CONFDIR) MANDIR=$(MANDIR) MANSUFFIX=$(MANSUFFIX) INCDIR=$(INCDIR) LIBDIR=$(LIBDIR) BLWMDIR=$(BLWMDIR) IMGDIR=$(IMGDIR) THEMEDIR=$(THEMEDIR) PATH_RM=$(PATH_RM) CXX="$(CXX)" CXXDEFINES="$(CXXDEFINES)" YACC="$(YACC)" YFLAGS="$(YFLAGS)" LEX="$(LEX)" LEXLIB="$(LEXLIB)" XPG4_LIB=$(XPG4_LIB) IMAGE_LIBS=$(IMAGE_LIBS) INSTALL="$(INSTALL)" MKDIRHIER="$(MKDIRHIER)" MV="$(MV)" RM="$(RM)" -f Makefile.std
++
++.PHONY: install
+ 
+ all:
+ 	@for flag in ${MAKEFLAGS} ''; do \