Date: Fri, 11 Aug 2000 16:48:04 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/20543: Update port: graphics/wmgrabimage Message-ID: <20000811234804.D205637BC9B@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 20543
>Category: ports
>Synopsis: Update port: graphics/wmgrabimage
>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 16:50:06 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/graphics/wmgrabimage/Makefile graphics/wmgrabimage/Makefile
--- /usr/ports/graphics/wmgrabimage/Makefile Thu Aug 3 21:15:51 2000
+++ graphics/wmgrabimage/Makefile Thu Aug 10 22:02:24 2000
@@ -16,15 +16,9 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/wmGrabImage
-USE_GMAKE= YES
USE_X_PREFIX= YES
USE_XPM= YES
MAN1= wmGrabImage.1
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/wmGrabImage ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/GrabImage ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/wmGrabImage.1 ${PREFIX}/man/man1
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/wmgrabimage/patches/patch-aa graphics/wmgrabimage/patches/patch-aa
--- /usr/ports/graphics/wmgrabimage/patches/patch-aa Thu Jan 6 05:55:48 2000
+++ graphics/wmgrabimage/patches/patch-aa Thu Aug 10 22:05:31 2000
@@ -1,22 +1,44 @@
---- Makefile.orig Mon Feb 1 15:55:30 1999
-+++ Makefile Wed Jan 5 14:31:02 2000
-@@ -1,6 +1,7 @@
+--- Makefile.orig Tue Feb 2 06:55:30 1999
++++ Makefile Thu Aug 10 22:05:20 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
-@@ -12,7 +13,7 @@
+ 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) -c $< -o $*.o $(INCDIR)
++ $(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR)
all: wmGrabImage.o wmGrabImage
+
+ wmGrabImage.o: wmGrabImage_master.xpm wmGrabImage_mask.xbm
+ wmGrabImage: $(OBJS)
+- $(CC) $(CFLAGS) $(SYSTEM) -o wmGrabImage $^ $(INCDIR) $(LIBDIR) $(LIBS)
++ $(CC) $(CFLAGS) $(SYSTEM) -o wmGrabImage $(OBJS) $(LIBDIR) $(LIBS)
+
+ clean:
+ for i in $(OBJS) ; do \
+@@ -28,7 +28,7 @@
+ rm -f wmGrabImage
+
+ install:: wmGrabImage
+- install -s -m 0755 wmGrabImage $(DESTDIR)/bin
+- install -m 0755 GrabImage $(DESTDIR)/bin
+- install -m 0644 wmGrabImage.1 $(DESTDIR)/man/man1
++ ${BSD_INSTALL_PROGRAM} wmGrabImage $(DESTDIR)/bin
++ ${BSD_INSTALL_SCRIPT} GrabImage $(DESTDIR)/bin
++ ${BSD_INSTALL_MAN} wmGrabImage.1 $(DESTDIR)/man/man1
+
diff -urN /usr/ports/graphics/wmgrabimage/pkg/DESCR graphics/wmgrabimage/pkg/DESCR
--- /usr/ports/graphics/wmgrabimage/pkg/DESCR Sat Jan 22 19:05:47 2000
+++ graphics/wmgrabimage/pkg/DESCR Sat Aug 12 04:43:07 2000
@@ -1,4 +1,4 @@
-wmGrabImage is a WindowMaker DockApp that maintains a small thumbnail copy of
+wmGrabImage is a Window Maker DockApp that maintains a small thumbnail copy of
your favorite image from the WWW. The image to monitor is specified via the
"-url <Image URL>" command-line option and it gets updated approximately every
5 minutes. The update interval can be overridden via the "-delay <Time>"
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000811234804.D205637BC9B>