Date: Mon, 18 Sep 2000 13:38:50 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/21374: Update port: sysutils/wmapm to 3.1 Message-ID: <20000918203850.C497537B422@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 21374 >Category: ports >Synopsis: Update port: sysutils/wmapm to 3.1 >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: Mon Sep 18 13:40:02 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1-RELEASE i386 >Organization: >Environment: >Description: - Update to version 3.1 Remove file: patches/patch-ab >How-To-Repeat: >Fix: diff -urN /usr/ports/sysutils/wmapm/Makefile sysutils/wmapm/Makefile --- /usr/ports/sysutils/wmapm/Makefile Thu Aug 3 21:31:09 2000 +++ sysutils/wmapm/Makefile Tue Sep 19 05:21:37 2000 @@ -6,28 +6,22 @@ # PORTNAME= wmapm -PORTVERSION= 3.01 +PORTVERSION= 3.1 CATEGORIES= sysutils windowmaker MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/ MAINTAINER= taoka@FreeBSD.org -WRKSRC= ${WRKDIR}/${DISTNAME}/wmapm -USE_GMAKE= yes ONLY_FOR_ARCHS= i386 + +WRKSRC= ${WRKDIR}/${DISTNAME}/wmapm + USE_X_PREFIX= yes USE_XPM= yes +MAN1= wmapm.1 + BINMODE= 2755 BINGRP= operator - -pre-build: - cd ${WRKDIR}/${DISTNAME}/wmapm; ${GMAKE} clean - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wmapm ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/wmapm.1 ${PREFIX}/man/man1 - -MAN1= wmapm.1 .include <bsd.port.mk> diff -urN /usr/ports/sysutils/wmapm/files/md5 sysutils/wmapm/files/md5 --- /usr/ports/sysutils/wmapm/files/md5 Wed Aug 25 10:37:58 1999 +++ sysutils/wmapm/files/md5 Tue Sep 19 05:21:04 2000 @@ -1 +1 @@ -MD5 (wmapm-3.01.tar.gz) = 36f58c8125f5faabe3c9d16474d81cd3 +MD5 (wmapm-3.1.tar.gz) = 5a62620d49b5cc4c2250e013149ca1e9 diff -urN /usr/ports/sysutils/wmapm/patches/patch-aa sysutils/wmapm/patches/patch-aa --- /usr/ports/sysutils/wmapm/patches/patch-aa Fri Aug 27 06:02:33 1999 +++ sysutils/wmapm/patches/patch-aa Tue Sep 19 05:24:27 2000 @@ -1,28 +1,40 @@ ---- Makefile.orig Tue Dec 15 16:58:08 1998 -+++ Makefile Wed Aug 25 23:55:58 1999 -@@ -1,6 +1,6 @@ +--- Makefile.orig Wed Jan 12 01:42:25 2000 ++++ Makefile Tue Sep 19 05:24:13 2000 +@@ -1,20 +1,20 @@ -CC = gcc -CFLAGS = -O2 -Wall --INCDIR = -I/usr/X11R6/include/X11 -+CC? = gcc -+CFLAGS? = -O2 -Wall -+INCDIR = -I/usr/X11R6/include - DESTDIR= /usr/X11R6 - LIBDIR = -L/usr/X11R6/lib +-INCDIR = -I/usr/X11R6/include +-DESTDIR= /usr/X11R6 +-LIBDIR = -L/usr/X11R6/lib ++CC ?= gcc ++CFLAGS ?= -O2 -Wall ++INCDIR = -I${X11BASE}/include ++DESTDIR= ${PREFIX} ++LIBDIR = -L${X11BASE}/lib LIBS = -lXpm -lX11 -lXext -@@ -8,13 +8,13 @@ + OBJS = wmapm.o \ ../wmgeneral/wmgeneral.o .c.o: - $(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) -+ $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) ++ $(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR) all: wmapm.o wmapm wmapm.o: wmapm_master.xpm wmapm_mask.xbm wmapm.h wmapm: $(OBJS) - $(CC) $(COPTS) $(SYSTEM) -o wmapm $^ $(INCDIR) $(LIBDIR) $(LIBS) -+ $(CC) $(CFLAGS) $(SYSTEM) -o wmapm $^ $(INCDIR) $(LIBDIR) $(LIBS) ++ $(CC) $(CFLAGS) $(SYSTEM) -o wmapm $(OBJS) $(LIBDIR) $(LIBS) clean: for i in $(OBJS) ; do \ +@@ -23,7 +23,6 @@ + rm -f wmapm + + install:: wmapm +- install -s -m 0755 wmapm $(DESTDIR)/bin +- install -m 0644 wmapm.1 $(DESTDIR)/man/man1 +- chmod +s $(DESTDIR)/bin/wmapm ++ ${BSD_INSTALL_PROGRAM} wmapm $(DESTDIR)/bin ++ ${BSD_INSTALL_MAN} wmapm.1 $(DESTDIR)/man/man1 + diff -urN /usr/ports/sysutils/wmapm/patches/patch-ab sysutils/wmapm/patches/patch-ab --- /usr/ports/sysutils/wmapm/patches/patch-ab Sat Oct 16 01:13:07 1999 +++ sysutils/wmapm/patches/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,153 +0,0 @@ ---- wmapm.c.orig Sun Jan 3 11:27:09 1999 -+++ wmapm.c Sat Oct 9 19:27:17 1999 -@@ -158,6 +158,20 @@ - #include "wmapm_master_LowColor.xpm" - #include "wmapm_mask.xbm" - -+#if !defined(MINIX) && !defined(WIN32) -+#include <sys/param.h> /* for NOFILE */ -+#endif -+ -+#if (BSD >= 199103) -+#define USE_POSIX_WAIT -+#define HAS_POSIX_SAVED_IDS -+#endif -+ -+#ifdef HAS_POSIX_SAVED_IDS -+#include <unistd.h> -+#include <sys/types.h> -+#include <errno.h> -+#endif /* HAS_POSIX_SAVED_IDS */ - - - #ifdef Linux -@@ -308,6 +322,7 @@ - my_cur_info.ac_line_status = (int)temp_info.ai_acline; - my_cur_info.battery_status = (int)temp_info.ai_batt_stat; - my_cur_info.battery_percentage = (int)temp_info.ai_batt_life; -+ my_cur_info.battery_time = (int)temp_info.ai_batt_time; - #endif - - -@@ -385,7 +400,7 @@ - * If charging: Time left before battery gets to maximum - * - */ --#ifdef Linux /* FreeBSD's apm info does not support time left */ -+#ifdef Linux - if (my_cur_info.battery_time >= 1440) { - - /* -@@ -411,11 +426,16 @@ - - } - #endif --#ifdef FreeBSD -- /* -- * Show "NULL" time indicator. -- */ -- copyXPMArea(83, 106, 41, 9, 15, 7); -+#if FreeBSD -+ time_left = my_cur_info.battery_time / 60; -+ hour_left = time_left / 60; -+ min_left = time_left % 60; -+ -+ copyXPMArea( (hour_left / 10) * 7 + 5, 93, 7, 9, 21, 7); /* Show 10's (hour) */ -+ copyXPMArea((hour_left % 10) * 7 + 5, 93, 7, 9, 29, 7); /* Show 1's (hour) */ -+ copyXPMArea(76, 93, 2, 9, 38, 7); /* colon */ -+ copyXPMArea((min_left / 10) * 7 + 5, 93, 7, 9, 42, 7); /* Show 10's (min) */ -+ copyXPMArea((min_left % 10) * 7 + 5, 93, 7, 9, 50, 7); /* Show 1's (min) */ - #endif - - -@@ -643,6 +663,13 @@ - - int x=xev->x; - int y=xev->y; -+#ifdef HAS_POSIX_SAVED_IDS -+ uid_t euid = geteuid(); -+ gid_t egid = getegid(); -+ uid_t ruid = getuid(); -+ gid_t rgid = getgid(); -+#endif /* HAS_POSIX_SAVED_IDS */ -+ - - if(x>=5 && y>=48 && x<=17 && y<=58){ - -@@ -656,7 +683,32 @@ - */ - copyXPMArea(5, 106, 13, 11, 5, 48); - RedrawWindow(); -+#if FreeBSD -+ -+#ifdef HAS_POSIX_SAVED_IDS -+ if (setegid(rgid) == -1) -+ (void) fprintf(stderr, "setegid(%d): %s\n", -+ (int) rgid, strerror(errno)); -+ if (seteuid(ruid) == -1) -+ (void) fprintf(stderr, "seteuid(%d): %s\n", -+ (int) ruid, strerror(errno)); -+#endif /* HAS_POSIX_SAVED_IDS */ -+ -+ system("apm -Z"); -+ -+#ifdef HAS_POSIX_SAVED_IDS -+ if (seteuid(euid) == -1) -+ (void) fprintf(stderr, "seteuid(%d): %s\n", -+ (int) euid, strerror(errno)); -+ -+ if (setegid(egid) == -1) -+ (void) fprintf(stderr, "setegid(%d): %s\n", -+ (int) egid, strerror(errno)); -+#endif -+ -+#else - system("apm -S"); -+#endif - usleep(2000000L); - - } else if (x>=46 && y>=48 && x<=58 && y<=58){ -@@ -671,7 +723,31 @@ - */ - copyXPMArea(21, 106, 13, 11, 46, 48); - RedrawWindow(); -+#if FreeBSD -+ -+#ifdef HAS_POSIX_SAVED_IDS -+ if (setegid(rgid) == -1) -+ (void) fprintf(stderr, "setegid(%d): %s\n", -+ (int) rgid, strerror(errno)); -+ if (seteuid(ruid) == -1) -+ (void) fprintf(stderr, "seteuid(%d): %s\n", -+ (int) ruid, strerror(errno)); -+#endif /* HAS_POSIX_SAVED_IDS */ -+ -+ system("apm -z"); -+#ifdef HAS_POSIX_SAVED_IDS -+ if (seteuid(euid) == -1) -+ (void) fprintf(stderr, "seteuid(%d): %s\n", -+ (int) euid, strerror(errno)); -+ -+ if (setegid(egid) == -1) -+ (void) fprintf(stderr, "setegid(%d): %s\n", -+ (int) egid, strerror(errno)); -+#endif -+ -+#else - system("apm -s"); -+#endif - usleep(2000000L); - - } -@@ -693,7 +769,11 @@ - int apm_exists() - { - -+#if FreeBSD -+ if (open(APMDEV, O_RDONLY) == -1) -+#else - if (access(APMDEV, R_OK)) -+#endif - - /* - * Cannot find /proc/apm >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?20000918203850.C497537B422>