cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- upgrade to version 1.03

Browse Source 
- add HOMEPAGE
- add @comment with RCS id to PLIST
This commit is contained in:
kevlo 2001-06-08 07:45:28 +00:00
parent 166d5a4d44
commit 9708409e96
9 changed files with 67 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
x11/piewm/Makefile
View File

@ -1,31 +1,23 @@
# $OpenBSD: Makefile,v 1.9 2001/05/06 04:41:21 lebel Exp $
# $OpenBSD: Makefile,v 1.10 2001/06/08 07:45:28 kevlo Exp $
#
COMMENT= "tvtwm with pie (circular) menus"
DISTNAME= piewm
PKGNAME= piewm-1.0
DISTNAME= piewm-1.03
CATEGORIES= x11
NEED_VERSION= 1.402
MAINTAINER= ports@OpenBSD.ORG
HOMEPAGE= http://www.crynwr.com/piewm/
MAINTAINER= ports@openbsd.org
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.x.org/R5contrib/
EXTRACT_SUFX= .tar.Z
MASTER_SITES= ftp://ftp.crynwr.com/piewm/
CONFIGURE_STYLE=imake
# piewm.tar.Z includes and old version of xpm, and also a bunch of .o
# files plus an executable. Get rid of them.
#
post-extract:
@rm -rf ${WRKDIR}/xpm
@cd ${WRKSRC} && make clean
CONFIGURE_STYLE= imake
.include <bsd.port.mk>

6
x11/piewm/files/md5
View File

@ -1,3 +1,3 @@
MD5 (piewm.tar.Z) = 91931fe49708c6181fd193cb8a7efbf4
RMD160 (piewm.tar.Z) = 53e6984310db94911e6acc0bfdb554d0d0183aaa
SHA1 (piewm.tar.Z) = b216a486b815e706bbff67fe43b8806180fd2fdb
MD5 (piewm-1.03.tar.gz) = d9dfa9d4ea27e0d54a352b1d22c0fc21
RMD160 (piewm-1.03.tar.gz) = 782732c008a504c3bec6c8b9e8ea9456dfc43a14
SHA1 (piewm-1.03.tar.gz) = d24cb63152872faa4ea3ec3404c32be2d739c1d7

44
x11/piewm/patches/patch-Imakefile Normal file
View File

@ -0,0 +1,44 @@
--- Imakefile.orig Fri Jun 8 15:15:06 2001
+++ Imakefile Fri Jun 8 15:26:01 2001
@@ -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) -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

99
x11/piewm/patches/patch-aa
View File

@ -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;

38
x11/piewm/patches/patch-ab
View File

@ -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)

22
x11/piewm/patches/patch-ac
View File

@ -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();

11
x11/piewm/patches/patch-gram.y Normal file
View File

@ -0,0 +1,11 @@
--- gram.y.orig Fri Jun 8 15:21:39 2001
+++ gram.y Fri Jun 8 15:21:52 2001
@@ -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

3
x11/piewm/pkg/DESCR
View File

@ -7,5 +7,4 @@ move the mouse into the virtual desktop window, grab a window with the
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.
- Satoshi
asami@cs.berkeley.edu
WWW: ${HOMEPAGE}

1
x11/piewm/pkg/PLIST
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2001/06/08 07:45:43 kevlo Exp $
bin/piewm
bin/ssetroot
lib/X11/piewm/system.twmrc