Use MAKE_ARGS/do-install

svn path=/head/; revision=135981

misc/wmmand/Makefile

@@ -18,8 +18,15 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/wmMand
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_GMAKE=	yes
 ALL_TARGET=	clean all
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
+		INCDIR=-I${X11BASE}/include LIBDIR=-L${X11BASE}/lib
 
 MAN1=		wmMand.1
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/wmMand ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/wmMand.1 ${MANPREFIX}/man/man1
+
 .include <bsd.port.mk>

misc/wmmand/files/patch-aa

@@ -1,42 +0,0 @@
---- Makefile.orig	Tue Feb 16 01:43:51 1999
-+++ Makefile	Fri Aug 11 02:34:35 2000
-@@ -1,8 +1,8 @@
--CC     = gcc
--CFLAGS = -O2 -Wall
--INCDIR = -I/usr/X11R6/include/X11
--DESTDIR= /usr/X11R6
--LIBDIR = -L/usr/X11R6/lib
-+CC     ?= gcc
-+CFLAGS ?= -O2
-+INCDIR = -I${X11BASE}/include
-+DESTDIR= ${PREFIX}
-+LIBDIR = -L${X11BASE}/lib
- # for linux
- LIBS   = -lXpm -lX11 -lXext
- # for Solaris
-@@ -12,14 +12,14 @@
- 
- 
- .c.o:
--	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
-+	$(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR)
- 
- 
- all:	wmMand.o wmMand
- 
- wmMand.o: wmMand_master.xpm wmMand_mask.xbm
- wmMand:	$(OBJS) 
--	$(CC) $(CFLAGS) $(SYSTEM) -o wmMand $^ $(INCDIR) $(LIBDIR) $(LIBS)
-+	$(CC) $(CFLAGS) $(SYSTEM) -o wmMand $(OBJS) $(LIBDIR) $(LIBS)
- 
- clean:
- 	for i in $(OBJS) ; do \
-@@ -28,6 +28,6 @@
- 	rm -f wmMand
- 
- install:: wmMand
--	install -s -m 0755 wmMand $(DESTDIR)/bin
--	install    -m 0644 wmMand.1 $(DESTDIR)/man/man1 
-+	${BSD_INSTALL_PROGRAM} wmMand $(DESTDIR)/bin
-+	${BSD_INSTALL_MAN} wmMand.1 $(DESTDIR)/man/man1 
-