From owner-freebsd-ports  Fri Aug 11 17: 0:46 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 2179237BD5B
	for <freebsd-ports@FreeBSD.org>; Fri, 11 Aug 2000 17:00:03 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id RAA17217;
	Fri, 11 Aug 2000 17:00:03 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B636437BC54; Fri, 11 Aug 2000 16:56:40 -0700 (PDT)
Message-Id: <20000811235640.B636437BC54@hub.freebsd.org>
Date: Fri, 11 Aug 2000 16:56:40 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/20552: Update port: x11-clocks/wmitime
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         20552
>Category:       ports
>Synopsis:       Update port: x11-clocks/wmitime
>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:03 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support X11BASE properly
- Remove USE_GMAKE
- WindowMaker -> Window Maker

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/x11-clocks/wmitime/Makefile x11-clocks/wmitime/Makefile
--- /usr/ports/x11-clocks/wmitime/Makefile	Thu Aug  3 21:36:31 2000
+++ x11-clocks/wmitime/Makefile	Sat Aug 12 01:04:19 2000
@@ -12,13 +12,9 @@
 
 MAINTAINER=	jim@FreeBSD.org
 
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
-
 WRKSRC=		${WRKDIR}/wmitime/wmitime
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmitime ${PREFIX}/bin
+USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 .include <bsd.port.mk>
diff -urN /usr/ports/x11-clocks/wmitime/patches/patch-aa x11-clocks/wmitime/patches/patch-aa
--- /usr/ports/x11-clocks/wmitime/patches/patch-aa	Mon Apr 19 22:37:25 1999
+++ x11-clocks/wmitime/patches/patch-aa	Sat Aug 12 01:03:45 2000
@@ -1,32 +1,32 @@
---- Makefile.orig	Thu Apr  1 17:38:14 1999
-+++ Makefile	Thu Apr  1 17:41:17 1999
-@@ -1,7 +1,10 @@
+--- Makefile.orig	Mon Mar 29 12:51:39 1999
++++ Makefile	Sat Aug 12 01:03:21 2000
+@@ -1,7 +1,9 @@
 -#LANG = fr
+-LIBDIR = -L/usr/X11R6/lib
 +CC ?= gcc
 +CFLAGS ?= -O2
-+CFLAGS += -Wall
-+INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
-+DESTDIR = /usr/X11R6
- LIBDIR = -L/usr/X11R6/lib
++INCDIR = -I${X11BASE}/include
++DESTDIR = ${PREFIX}
++LIBDIR = -L${X11BASE}/lib
  LIBS   = -lXpm -lXext -lX11 -lm
 -FLAGS = -O2
  OBJS =	wmitime.o \
  		../wmgeneral/wmgeneral.o \
  		../wmgeneral/misc.o \
-@@ -9,10 +12,10 @@
+@@ -9,10 +11,10 @@
  
  
  .c.o:
 -	cc -I/usr/X11R6/share/include $(FLAGS) -D$(LANG) -c -Wall $< -o $*.o
-+	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
++	$(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR)
  
  wmtime: $(OBJS)
 -	cc $(FLAGS) -D$(LANG) -o wmitime $^ -lXext $(LIBDIR) $(LIBS)
-+	 $(CC) $(CFLAGS) $(SYSTEM) -o wmitime $^ $(INCDIR) $(LIBDIR) $(LIBS)
++	 $(CC) $(CFLAGS) $(SYSTEM) -o wmitime $(OBJS) $(LIBDIR) $(LIBS)
  
  all:: wmtime
  
-@@ -24,24 +27,5 @@
+@@ -24,24 +26,5 @@
  	rm -f *~
  
  install:: wmitime
@@ -37,7 +37,7 @@
 -#	chmod 600 $(HOME)/.wminetrc
 -#	cp wminetrc /etc/wminetrc
 -#	chmod 644 /etc/wminetrc
-+	install -s -m 0755 wmitime $(DESTDIR)/bin
++	${BSD_INSTALL_PROGRAM} wmitime $(DESTDIR)/bin
  	@echo "wmitime Installation finished..."
 -
 -


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


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