From owner-freebsd-ports  Fri Aug 11 17: 0:13 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id A35C937BCB7
	for <freebsd-ports@FreeBSD.org>; Fri, 11 Aug 2000 17:00:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id RAA17172;
	Fri, 11 Aug 2000 17:00:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3E35637BBE5; Fri, 11 Aug 2000 16:51:21 -0700 (PDT)
Message-Id: <20000811235121.3E35637BBE5@hub.freebsd.org>
Date: Fri, 11 Aug 2000 16:51:21 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/20547: Update port: misc/wmmand
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         20547
>Category:       ports
>Synopsis:       Update port: misc/wmmand
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 11 17:00:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support X11BASE properly
- Remove USE_GMAKE

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/misc/wmmand/Makefile misc/wmmand/Makefile
--- /usr/ports/misc/wmmand/Makefile	Thu Aug  3 21:24:12 2000
+++ misc/wmmand/Makefile	Fri Aug 11 02:37:45 2000
@@ -14,15 +14,10 @@
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmMand
 
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 ALL_TARGET=	clean all
 
 MAN1=		wmMand.1
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmMand ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/wmMand.1 ${PREFIX}/man/man1/
 
 .include <bsd.port.mk>
diff -urN /usr/ports/misc/wmmand/patches/patch-aa misc/wmmand/patches/patch-aa
--- /usr/ports/misc/wmmand/patches/patch-aa	Fri Apr 30 14:48:00 1999
+++ misc/wmmand/patches/patch-aa	Fri Aug 11 02:34:46 2000
@@ -1,13 +1,42 @@
---- Makefile.orig	Fri Apr 16 14:55:02 1999
-+++ Makefile	Fri Apr 16 14:55:26 1999
-@@ -1,6 +1,7 @@
+--- 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
-+CFLAGS += -Wall
-+INCDIR = -I/usr/X11R6/include
- DESTDIR= /usr/X11R6
- LIBDIR = -L/usr/X11R6/lib
++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 
+ 


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message