Date: Thu, 9 Dec 1999 10:50:28 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@freebsd.org Subject: ports/15384: Update port: x11-wm/piewm to 1.02 Message-ID: <19991209185028.88AA6156A8@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 15384 >Category: ports >Synopsis: Update port: x11-wm/piewm to 1.02 >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: Thu Dec 9 11:00:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.3-RELEASE i386 >Organization: >Environment: >Description: * Update version 1.0 to 1.02 * Fixed MASTER_SITES New file: patches/patch-ad patches/patche-ae patches/patch-af patches/patch-ag Removed file: patches/patch-aa patches/patche-ab patches/patch-ac >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-wm/piewm/Makefile x11-wm/piewm/Makefile --- /usr/ports/x11-wm/piewm/Makefile Tue Aug 31 21:10:35 1999 +++ x11-wm/piewm/Makefile Thu Dec 9 23:20:56 1999 @@ -1,16 +1,14 @@ # New ports collection makefile for: piewm -# Version required: ? (there is only one piewm version avyway) +# Version required: 1.02 # Date created: 24 November 1994 # Whom: asami # # $FreeBSD: ports/x11-wm/piewm/Makefile,v 1.18 1999/08/31 06:53:14 mharo Exp $ # -DISTNAME= piewm -PKGNAME= piewm-1.0 +DISTNAME= piewm-1.02 CATEGORIES= x11-wm -MASTER_SITES= ftp://ftp.x.org/R5contrib/ -EXTRACT_SUFX= .tar.Z +MASTER_SITES= ftp://ftp.crynwr.com/piewm/ MAINTAINER= ports@FreeBSD.org @@ -18,14 +16,5 @@ USE_IMAKE= yes MAN1= piewm.1 - -# piewm.tar.Z includes and old version of xpm, and also a bunch of .o -# files plus an executable - -pre-configure: - @${RM} -rf ${WRKDIR}/xpm - -pre-build: - @(cd ${WRKSRC}; ${MAKE} clean) .include <bsd.port.mk> diff -urN /usr/ports/x11-wm/piewm/files/md5 x11-wm/piewm/files/md5 --- /usr/ports/x11-wm/piewm/files/md5 Fri Mar 31 00:00:00 1995 +++ x11-wm/piewm/files/md5 Thu Dec 9 23:21:57 1999 @@ -1 +1 @@ -MD5 (piewm.tar.Z) = 91931fe49708c6181fd193cb8a7efbf4 +MD5 (piewm-1.02.tar.gz) = 9895087fe598318768fa3ea7f7e876e9 diff -urN /usr/ports/x11-wm/piewm/patches/patch-aa x11-wm/piewm/patches/patch-aa --- /usr/ports/x11-wm/piewm/patches/patch-aa Wed Nov 30 00:00:00 1994 +++ x11-wm/piewm/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,99 +0,0 @@ ---- ./Imakefile.orig Mon Nov 23 15:50:18 1992 -+++ ./Imakefile Tue Nov 22 16:32:18 1994 -@@ -22,10 +22,10 @@ - /**/# <X11/xpm.h>. - /**/# - -- PIEWMDIR = /usr/local/lib/piewm -- XPMLIB = -L../xpm -lXpm -- XPM_DEF = -DXPM -I../xpm -- XLOADIM_DEF = -DXLOADIMAGE=\"/usr/local/bin/xloadimage\" -+ PIEWMDIR = $(LIBDIR)/piewm -+ XPMLIB = -L$(USRLIBDIR) -lXpm -+ XPM_DEF = -DXPM -+ XLOADIM_DEF = -DXLOADIMAGE=\"$(BINDIR)/xloadimage\" - MATHLIB = -lm - - /**/# Ultrix doesn't have a mkstemp in libc... -@@ -36,7 +36,7 @@ - LOCAL_DEFINES = $(XPM_DEF) - #endif - --LOCAL_LIBRARIES = $(XMULIB) $(EXTENSIONLIB) $(XPMLIB) $(XLIB) $(MATHLIB) -+LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(EXTENSIONLIB) $(XPMLIB) $(XLIB) $(MATHLIB) - LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB) - DEFINES = ExtensionDefines $(LOCAL_DEFINES) $(SIGNAL_DEFINES) - -@@ -61,9 +61,9 @@ - ComplexProgramTarget(piewm) - NormalProgramTarget(ssetroot,ssetroot.o,,$(LOCAL_LIBRARIES),) - --MakeDirectories(install,$(TWMDIR)) --InstallNonExec(system.twmrc,$(TWMDIR)) --/**/# InstallNamedProg(ssetroot,xsetroot,$(BINDIR)) -+MakeDirectories(install,$(PIEWMDIR)) -+InstallNonExec(system.twmrc,$(PIEWMDIR)) -+/**/# InstallNamedProg(ssetroot,ssetroot,$(BINDIR)) - - gram.h gram.c: gram.y - $(YACC) $(YFLAGS) gram.y ---- ./gram.y.orig Wed Oct 7 23:41:31 1992 -+++ ./gram.y Wed May 18 11:50:47 1994 -@@ -71,7 +71,7 @@ - extern int do_single_keyword(), do_string_keyword(), do_number_keyword(); - extern name_list **do_colorlist_keyword(); - extern int do_color_keyword(); --extern int yylineno; -+int yylineno; - %} - - %union ---- ./lex.l.orig Sun Oct 4 00:50:52 1992 -+++ ./lex.l Wed May 18 11:50:49 1994 -@@ -43,6 +43,18 @@ - - extern int ParseError; - -+ -+#undef YY_INPUT -+#define YY_INPUT(buf,result,max_size) \ -+ { \ -+ int res = (*twmInputFunc)() ; \ -+ if (res == NULL) result = YY_NULL ; \ -+ else { \ -+ buf[0] = res ; \ -+ result = 1 ; \ -+ } \ -+ } -+ - %} - - string \"([^"]|\\.)*\" -@@ -88,13 +100,13 @@ - ParseError = 1; - } - %% --yywrap() { return(1);} -+/* yywrap() { return(1);} */ - - #undef unput --#undef input -+/* #undef input */ - #undef output - #undef feof - #define unput(c) twmUnput(c) --#define input() (*twmInputFunc)() -+/* #define input() (*twmInputFunc)() */ - #define output(c) TwmOutput(c) - #define feof() (1) ---- ./menus.c.orig Sun Nov 15 10:04:46 1992 -+++ ./menus.c Wed May 18 12:12:53 1994 -@@ -673,7 +683,7 @@ - FD_ZERO(&exceptfds); FD_SET(fd, &exceptfds); - - if (!deferred) { -- select(fd + 1, &readfds, &exceptfds, NULL); -+ select(fd + 1, &readfds, NULL, &exceptfds, NULL); - } else { - gettimeofday(&now_time, NULL); - now_time.tv_sec -= start_time.tv_sec; diff -urN /usr/ports/x11-wm/piewm/patches/patch-ab x11-wm/piewm/patches/patch-ab --- /usr/ports/x11-wm/piewm/patches/patch-ab Thu Nov 24 00:00:00 1994 +++ x11-wm/piewm/patches/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,38 +0,0 @@ ---- ./menus.c.org Wed May 18 12:12:53 1994 -+++ ./menus.c Thu Nov 17 08:40:01 1994 -@@ -634,7 +634,7 @@ - { - MenuItem *mi; - MenuItem *badItem = NULL; -- int fd = dpy->fd; -+ int fd = ConnectionNumber(dpy); - struct timeval start_time, now_time, delay_time; - fd_set readfds, exceptfds; - int deferred; ---- ./LocPixmap.c.org Wed May 18 11:13:01 1994 -+++ ./LocPixmap.c Thu Nov 17 08:49:20 1994 -@@ -140,11 +140,11 @@ - /* xrm_class[0] = XrmPermStringToQuark ("BitmapFilePath"); */ - xrm_class[0] = XrmStringToQuark ("BitmapFilePath"); - xrm_class[1] = NULLQUARK; -- if (/* !XrmGetDatabase(dpy) */ !(dpy->db)) { -+ if (!XrmGetDatabase(dpy) /* !(dpy->db) */) { - /* what a hack; need to initialize it */ - (void) XGetDefault (dpy, "", ""); - } -- if (XrmQGetResource (/* XrmGetDatabase(dpy) */ dpy->db, -+ if (XrmQGetResource (XrmGetDatabase(dpy) /* dpy->db */, - xrm_name, xrm_class, - &rep_type, &value) && - /* rep_type == XrmPermStringToQuark("String") */ ---- ./Imakefile.org Sun May 22 00:05:43 1994 -+++ ./Imakefile Thu Nov 17 08:54:08 1994 -@@ -36,7 +36,7 @@ - LOCAL_DEFINES = $(XPM_DEF) - #endif - --LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(EXTENSIONLIB) $(XPMLIB) $(XLIB) $(MATHLIB) -+LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(EXTENSIONLIB) $(XPMLIB) $(XLIB) $(MATHLIB) $(LEXLIB) - LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB) - DEFINES = ExtensionDefines $(LOCAL_DEFINES) $(SIGNAL_DEFINES) - diff -urN /usr/ports/x11-wm/piewm/patches/patch-ac x11-wm/piewm/patches/patch-ac --- /usr/ports/x11-wm/piewm/patches/patch-ac Mon Dec 23 00:00:00 1996 +++ x11-wm/piewm/patches/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,22 +0,0 @@ ---- ./Imakefile.org Sun Nov 27 01:57:15 1994 -+++ ./Imakefile Sun Nov 27 02:04:16 1994 -@@ -33,7 +33,7 @@ - #ifdef UltrixArchitecture - LOCAL_DEFINES = $(XPM_DEF) -DNOSTEMP - #else -- LOCAL_DEFINES = $(XPM_DEF) -+ LOCAL_DEFINES = $(XPM_DEF) -DBITMAPDIR=\"$(INCROOT)/X11/bitmaps\" -DSHAPE - #endif - - LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(EXTENSIONLIB) $(XPMLIB) $(XLIB) $(MATHLIB) $(LEXLIB) ---- ./twm.h.org Thu Oct 15 13:31:50 1992 -+++ ./twm.h Sun Dec 22 15:48:14 1996 -@@ -305,8 +305,6 @@ - #define TBPM_MENU ":menu" /* name of titlebar pixmap for menus */ - #define TBPM_QUESTION ":question" /* name of unknown titlebar pixmap */ - --extern char *malloc(), *calloc(), *realloc(), *getenv(); --extern int free(); - extern void Reborder(), Done(); - void ComputeCommonTitleOffsets(); - void ComputeWindowTitleOffsets(), ComputeTitleLocation(); diff -urN /usr/ports/x11-wm/piewm/patches/patch-ad x11-wm/piewm/patches/patch-ad --- /usr/ports/x11-wm/piewm/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ x11-wm/piewm/patches/patch-ad Thu Dec 9 23:35:53 1999 @@ -0,0 +1,44 @@ +--- Imakefile.orig Tue Jan 6 05:19:46 1998 ++++ Imakefile Thu Dec 9 23:29:58 1999 +@@ -11,7 +11,7 @@ + TAGS = etags + + # change if you want it to look elsewhere for its files. +- PIEWMDIR = /usr/local/lib/piewm ++ PIEWMDIR = $(LIBDIR)/piewm + + # + # Keep uncommented to allow the xloadimage program by Jim Frost to +@@ -19,16 +19,16 @@ + # other image formats besides Xpm or Xbm) + # Chris P. Ross + # <cross@eng.umd.edu> +- XLOADIM_DEF = -DXLOADIMAGE=\"/usr/local/bin/xloadimage\" ++ XLOADIM_DEF = -DXLOADIMAGE=\"$(BINDIR)/xloadimage\" + MATHLIB = -lm +- LOCAL_DEFINES = -DSHAPE ++ LOCAL_DEFINES = -DBITMAPDIR=\"$(INCROOT)/X11/bitmaps\" -DSHAPE + + /**/# Ultrix doesn't have a mkstemp in libc... + #ifdef UltrixArchitecture + ULTRIX_DEFINES = -DNOSTEMP + #endif + +-LOCAL_LIBRARIES = $(XMULIB) $(EXTENSIONLIB) $(XLIB) $(MATHLIB) -lXpm ++LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(EXTENSIONLIB) $(XLIB) $(MATHLIB) $(LEXLIB) -lXpm + LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB) + DEFINES = ExtensionDefines $(LOCAL_DEFINES) $(SIGNAL_DEFINES) $(ULTRIX_DEFINES) + +@@ -53,9 +53,9 @@ + ComplexProgramTarget(piewm) + NormalProgramTarget(ssetroot,ssetroot.o,,$(LOCAL_LIBRARIES),) + +-MakeDirectories(install,$(TWMDIR)) +-InstallNonExec(system.twmrc,$(TWMDIR)) +-# InstallNamedProg(ssetroot,xsetroot,$(BINDIR)) ++MakeDirectories(install,$(PIEWMDIR)) ++InstallNonExec(system.twmrc,$(PIEWMDIR)) ++# InstallNamedProg(ssetroot,ssetroot,$(BINDIR)) + + gram.h gram.c: gram.y + $(YACC) $(YFLAGS) gram.y diff -urN /usr/ports/x11-wm/piewm/patches/patch-ae x11-wm/piewm/patches/patch-ae --- /usr/ports/x11-wm/piewm/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ x11-wm/piewm/patches/patch-ae Thu Dec 9 23:36:14 1999 @@ -0,0 +1,11 @@ +--- gram.y.orig Thu Jan 1 15:33:42 1998 ++++ gram.y Thu Dec 9 23:31:00 1999 +@@ -71,7 +71,7 @@ + extern int do_single_keyword(), do_string_keyword(), do_number_keyword(); + extern name_list **do_colorlist_keyword(); + extern int do_color_keyword(); +-extern int yylineno; ++int yylineno; + %} + + %union diff -urN /usr/ports/x11-wm/piewm/patches/patch-af x11-wm/piewm/patches/patch-af --- /usr/ports/x11-wm/piewm/patches/patch-af Thu Jan 1 09:00:00 1970 +++ x11-wm/piewm/patches/patch-af Thu Dec 9 23:58:45 1999 @@ -0,0 +1,15 @@ +--- list.h.orig Thu Jun 4 00:51:02 1998 ++++ list.h Thu Dec 9 23:53:03 1999 +@@ -50,9 +50,9 @@ + }; + + +-extern void AddToList(name_list **list_head, char *name, char *ptr); +-extern char* LookInList(name_list *list_head, char *name, void/*XClassHint*/ *class); +-extern char* LookInNameList(name_list *list_head, char *name); ++extern void AddToList(); ++extern char* LookInList(); ++extern char* LookInNameList(); + + #endif /* _LIST_ */ + diff -urN /usr/ports/x11-wm/piewm/patches/patch-ag x11-wm/piewm/patches/patch-ag --- /usr/ports/x11-wm/piewm/patches/patch-ag Thu Jan 1 09:00:00 1970 +++ x11-wm/piewm/patches/patch-ag Fri Dec 10 01:00:08 1999 @@ -0,0 +1,11 @@ +--- parse.c.orig Thu Jun 4 00:41:45 1998 ++++ parse.c Fri Dec 10 00:58:28 1999 +@@ -1376,7 +1376,7 @@ + dup2(fids[1], 1); /* stdout = pipe to parent */ + /* get_defs("m4", dpy, display_name) */ + tmp_file = m4_defs(dpy, display_name); +- execlp("m4", "m4", "-s", tmp_file, "-", NULL); ++ execlp("m4", "m4", tmp_file, "-", NULL); + /* If we get here we are screwed... */ + perror("Can't execlp() m4"); + exit(124); diff -urN /usr/ports/x11-wm/piewm/pkg/DESCR x11-wm/piewm/pkg/DESCR --- /usr/ports/x11-wm/piewm/pkg/DESCR Thu Nov 24 00:00:00 1994 +++ x11-wm/piewm/pkg/DESCR Thu Dec 9 23:23:05 1999 @@ -7,5 +7,7 @@ middle button, and move the mouse out, and then the window will appear in the current screen. This feature is exactly the same as tvtwm. +WWW: http://www.crynwr.com/piewm/ + - Satoshi asami@cs.berkeley.edu >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?19991209185028.88AA6156A8>