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

- fix PLIST, man pages are not compressed for OpenBSD

Browse Source 
- fix Makefile to fetch a tar archive now that cdrom.com does not make
  tarballs
- convert patches to unified diffs
- combine patch-ab and patch-ac into one patch, patch-ab
This commit is contained in:
brad 1999-09-22 22:23:20 +00:00
parent 0ffb729a4e
commit e3d94cbb59
6 changed files with 92 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
games/xroach/Makefile
View File

@ -1,18 +1,16 @@
# $OpenBSD: Makefile,v 1.4 1998/11/09 01:50:01 marc Exp $
#
# $OpenBSD: Makefile,v 1.5 1999/09/22 22:23:20 brad Exp $
DISTNAME= xroach
PKGNAME= xroach-4.4
CATEGORIES= x11 games
#BROKEN= "xroach.tar.gz doesn't exist"
# (xroach is a directory that contains the source)
MASTER_SITES= ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
EXTRACT_SUFX= .tar
MAINTAINER= mickey@openbsd.org
MASTER_SITES= ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
USE_X11= yes
WRKSRC= ${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xroach
post-extract:
@${RM} -f ${WRKSRC}/obj
.include <bsd.port.mk>

6
games/xroach/files/md5
View File

@ -1,3 +1,3 @@
MD5 (xroach.tar.gz) = 5564644cf674c929fe25d141874b53a0
RMD160 (xroach.tar.gz) = e8fdad0285070cda5ba76313893e61748c76f142
SHA1 (xroach.tar.gz) = 3d299beb44bc34882efd937a911a7a4dbb5c796e
MD5 (xroach.tar) = 06f3887f12ab623642b446f7b330ae80
RMD160 (xroach.tar) = d479f741fe5b483375290d43a870d06dcf0e200b
SHA1 (xroach.tar) = 63b8f70508bf767ddfa971aa1f75c9efa52e52f3

57
games/xroach/patches/patch-aa
View File

@ -1,32 +1,25 @@
diff -cdNr ../xroach.BSD/Makefile ./Makefile
*** ../xroach.BSD/Makefile Wed Jun 9 04:12:04 1993
--- ./Makefile Fri Dec 22 19:52:19 1995
***************
*** 1,9 ****
! # @(#)Makefile 8.1 (Berkeley) 6/8/93
PROG= xroach
! MAN6= xroach.0
! CFLAGS+= -I${.CURDIR}/bitmaps
! DPADD= ${LIBX} ${LIBM}
! LDADD= -lX11/X11 -lm
.include <bsd.prog.mk>
--- 1,17 ----
! # @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= xroach
! MAN= xroach.6
!
! DPADD+= ${X11BASE}/lib/libX11.a ${LIBM}
! CFLAGS+= -I${X11BASE}/include -I${.CURDIR}/bitmaps
! LDDESTDIR+= -L${X11BASE}/lib
! LDADD+= ${LDDESTDIR} -lX11 -lm
!
! MANDIR= ${X11BASE}/man/man
!
! BINOWN= bin
! BINDIR= ${X11BASE}/bin
! BINMODE= 755
.include <bsd.prog.mk>
--- Makefile.orig Tue Jun 8 22:12:04 1993
+++ Makefile Wed Sep 22 18:16:29 1999
@@ -1,9 +1,17 @@
-# @(#)Makefile 8.1 (Berkeley) 6/8/93
+# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= xroach
-MAN6= xroach.0
-CFLAGS+= -I${.CURDIR}/bitmaps
-DPADD= ${LIBX} ${LIBM}
-LDADD= -lX11/X11 -lm
+MAN= xroach.6
+
+DPADD+= ${X11BASE}/lib/libX11.a ${LIBM}
+CFLAGS+= -I${X11BASE}/include -I${.CURDIR}/bitmaps
+LDDESTDIR+= -L${X11BASE}/lib
+LDADD+= ${LDDESTDIR} -lX11 -lm
+
+MANDIR= ${X11BASE}/man/man
+
+BINOWN= bin
+BINDIR= ${X11BASE}/bin
+BINMODE= 755
.include <bsd.prog.mk>

104
games/xroach/patches/patch-ab
View File

@ -1,47 +1,57 @@
*** xroach.c.orig Sat May 4 21:18:41 1996
--- xroach.c Sat May 4 17:50:29 1996
***************
*** 96,114 ****
/*
Process command line options.
*/
! for (ax=1; ax<ac; ax++) {
! arg = av[ax];
if (strcmp(arg, "-display") == 0) {
! display_name = av[++ax];
}
else if (strcmp(arg, "-rc") == 0) {
! roachColor = av[++ax];
}
else if (strcmp(arg, "-speed") == 0) {
! roachSpeed = atof(av[++ax]);
}
else if (strcmp(arg, "-roaches") == 0) {
! maxRoaches = strtol(av[++ax], (char **)NULL, 0);
}
else {
Usage();
--- 96,118 ----
/*
Process command line options.
*/
! for (ax=1; ax<ac; ) {
! arg = av[ax++];
!
! if (ax >= ac)
! Usage();
!
if (strcmp(arg, "-display") == 0) {
! display_name = av[ax++];
}
else if (strcmp(arg, "-rc") == 0) {
! roachColor = av[ax++];
}
else if (strcmp(arg, "-speed") == 0) {
! roachSpeed = atof(av[ax++]);
}
else if (strcmp(arg, "-roaches") == 0) {
! maxRoaches = strtol(av[ax++], (char **)NULL, 0);
}
else {
Usage();
--- xroach.c.orig Wed Sep 22 18:18:08 1999
+++ xroach.c Wed Sep 22 18:18:17 1999
@@ -77,7 +77,7 @@
int MarkHiddenRoaches();
Pixel AllocNamedColor();
-void
+int
main(ac, av)
int ac;
char *av[];
@@ -96,26 +96,30 @@
/*
Process command line options.
*/
- for (ax=1; ax<ac; ax++) {
- arg = av[ax];
+ for (ax=1; ax<ac; ) {
+ arg = av[ax++];
+
+ if (ax >= ac)
+ Usage();
+
if (strcmp(arg, "-display") == 0) {
- display_name = av[++ax];
+ display_name = av[ax++];
}
else if (strcmp(arg, "-rc") == 0) {
- roachColor = av[++ax];
+ roachColor = av[ax++];
}
else if (strcmp(arg, "-speed") == 0) {
- roachSpeed = atof(av[++ax]);
+ roachSpeed = atof(av[ax++]);
}
else if (strcmp(arg, "-roaches") == 0) {
- maxRoaches = strtol(av[++ax], (char **)NULL, 0);
+ maxRoaches = strtol(av[ax++], (char **)NULL, 0);
}
else {
Usage();
}
}
- srand((int)time((long *)NULL));
+ srand((int)time(NULL));
/*
Catch some signals so we can erase any visible roaches.
@@ -212,6 +216,7 @@
CoverRoot();
XCloseDisplay(display);
+ return (0);
}
#define USEPRT(msg) fprintf(stderr, msg)

28
games/xroach/patches/patch-ac
View File

@ -1,28 +0,0 @@
--- xroach.c.orig Fri Apr 10 15:40:54 1998
+++ xroach.c Fri Apr 10 15:41:14 1998
@@ -77,7 +77,7 @@
int MarkHiddenRoaches();
Pixel AllocNamedColor();
-void
+int
main(ac, av)
int ac;
char *av[];
@@ -119,7 +119,7 @@
}
}
- srand((int)time((long *)NULL));
+ srand((int)time(NULL));
/*
Catch some signals so we can erase any visible roaches.
@@ -216,6 +216,7 @@
CoverRoot();
XCloseDisplay(display);
+ return (0);
}
#define USEPRT(msg) fprintf(stderr, msg)

2
games/xroach/pkg/PLIST
View File

@ -1,2 +1,2 @@
bin/xroach
man/man6/xroach.6.gz
man/man6/xroach.6