Bug 25310
| Summary: | New port: games/tetrinet, A tetrinet client and server for the console, fixed | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | fredrik <fredrik> | ||||
| Component: | Individual Port(s) | Assignee: | Peter Pentchev <roam> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
fredrik
2001-02-23 15:00:04 UTC
Responsible Changed From-To: freebsd-ports->roam I'll take care of this; <NBA> I love this game! </NBA> On Fri, Feb 23, 2001 at 06:58:11AM -0800, fredrik@wasadata.com wrote: > > >Number: 25310 > >Category: ports > >Synopsis: New port: games/tetrinet, A tetrinet client and server for the console, fixed > >Originator: Fredrik Carlsson What do you think about the attached patch? It addresses several issues: - portlint reports whitespace at the end of some lines in the Makefile; - no need to manually strip the executables, INSTALL_PROGRAM already does that; - add %%PORTDOCS%% to the pkg-plist, so those files are not added to the list if NOPORTDOCS is defined (causes problems later upon pkg-delete); - fix the server.c patch to also include <sys/types.h> and order the includes; - add a new patch to sockets.c to include <sys/types.h> and <sys/socket.h>. Other than that, this works great! :) G'luck, Peter -- No language can express every thought unambiguously, least of all this one. diff -urN tetrinet-old/Makefile tetrinet/Makefile --- tetrinet-old/Makefile Sun Mar 4 18:07:31 2001 +++ tetrinet/Makefile Sun Mar 4 18:07:14 2001 @@ -1,6 +1,6 @@ # New ports collection makefile for: tetrinet # Date created: 23 Februari 2001 -# Whom: Fredrik Carlsson <fredrik@wasadata.com> +# Whom: Fredrik Carlsson <fredrik@wasadata.com> # # $FreeBSD$ # @@ -9,9 +9,9 @@ PORTVERSION= 0.7 CATEGORIES= games net MASTER_SITES= http://achurch.org/tetrinet/ -DISTNAME= tetrinet +DISTNAME= ${PORTNAME} -MAINTAINER= <fredrik@wasadata.com> +MAINTAINER= <fredrik@wasadata.com> do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tetrinet ${PREFIX}/bin @@ -23,8 +23,6 @@ .endif post-install: - @strip ${PREFIX}/bin/tetrinet - @strip ${PREFIX}/bin/tetrinet-server @${ECHO} @${CAT} ${PKGMESSAGE} @${ECHO} diff -urN tetrinet-old/files/patch-ab tetrinet/files/patch-ab --- tetrinet-old/files/patch-ab Sun Mar 4 18:07:31 2001 +++ tetrinet/files/patch-ab Sun Mar 4 17:58:21 2001 @@ -1,10 +1,22 @@ ---- server.orig Fri Sep 15 05:16:31 2000 -+++ server.c Fri Feb 23 05:31:59 2001 -@@ -9,6 +9,7 @@ - #include <stdlib.h> - #include <string.h> - #include <errno.h> +--- server.c.old Sun Mar 4 17:57:08 2001 ++++ server.c Sun Mar 4 17:57:44 2001 +@@ -4,6 +4,10 @@ + * Tetrinet server code + */ + +#include <sys/types.h> - #include <netinet/in.h> - /* Due to glibc brokenness, we can't blindly include this. Yet another ++#include <sys/socket.h> ++#include <sys/time.h> ++ + #include <stdarg.h> + #include <stdio.h> + #include <stdlib.h> +@@ -14,8 +18,6 @@ * reason to not use glibc. */ + /* #include <netinet/protocols.h> */ + #include <signal.h> +-#include <sys/socket.h> +-#include <sys/time.h> + #include "tetrinet.h" + #include "tetris.h" + #include "server.h" diff -urN tetrinet-old/files/patch-ac tetrinet/files/patch-ac --- tetrinet-old/files/patch-ac Thu Jan 1 02:00:00 1970 +++ tetrinet/files/patch-ac Sun Mar 4 17:58:31 2001 @@ -0,0 +1,21 @@ +--- sockets.c.old Sun Mar 4 17:57:04 2001 ++++ sockets.c Sun Mar 4 17:58:02 2001 +@@ -4,14 +4,16 @@ + * Socket routines. + */ + ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <sys/time.h> ++ + #include <stdarg.h> + #include <stdio.h> + #include <stdlib.h> + #include <errno.h> + #include <netdb.h> + #include <netinet/in.h> +-#include <sys/socket.h> +-#include <sys/time.h> + #include "sockets.h" + #include "tetrinet.h" + diff -urN tetrinet-old/pkg-plist tetrinet/pkg-plist --- tetrinet-old/pkg-plist Sun Mar 4 18:07:31 2001 +++ tetrinet/pkg-plist Sun Mar 4 18:00:09 2001 @@ -1,5 +1,5 @@ bin/tetrinet bin/tetrinet-server -share/doc/tetrinet/README -share/doc/tetrinet/tetrinet.txt -@dirrm share/doc/tetrinet +%%PORTDOCS%%share/doc/tetrinet/README +%%PORTDOCS%%share/doc/tetrinet/tetrinet.txt +%%PORTDOCS%%@dirrm share/doc/tetrinet Peter Pentchev wrote: > On Fri, Feb 23, 2001 at 06:58:11AM -0800, fredrik@wasadata.com wrote: > > > > >Number: 25310 > > >Category: ports > > >Synopsis: New port: games/tetrinet, A tetrinet client and server for the console, fixed > > >Originator: Fredrik Carlsson > > What do you think about the attached patch? It addresses several issues: > - portlint reports whitespace at the end of some lines in the Makefile; > - no need to manually strip the executables, INSTALL_PROGRAM already does that; > - add %%PORTDOCS%% to the pkg-plist, so those files are not added to the list > if NOPORTDOCS is defined (causes problems later upon pkg-delete); > - fix the server.c patch to also include <sys/types.h> and order the includes; > - add a new patch to sockets.c to include <sys/types.h> and <sys/socket.h>. > > Other than that, this works great! :) > > G'luck, > Peter > > -- > No language can express every thought unambiguously, least of all this one. > > diff -urN tetrinet-old/Makefile tetrinet/Makefile > --- tetrinet-old/Makefile Sun Mar 4 18:07:31 2001 > +++ tetrinet/Makefile Sun Mar 4 18:07:14 2001 > @@ -1,6 +1,6 @@ > # New ports collection makefile for: tetrinet > # Date created: 23 Februari 2001 > -# Whom: Fredrik Carlsson <fredrik@wasadata.com> > +# Whom: Fredrik Carlsson <fredrik@wasadata.com> > # > # $FreeBSD$ > # > @@ -9,9 +9,9 @@ > PORTVERSION= 0.7 > CATEGORIES= games net > MASTER_SITES= http://achurch.org/tetrinet/ > -DISTNAME= tetrinet > +DISTNAME= ${PORTNAME} > > -MAINTAINER= <fredrik@wasadata.com> > +MAINTAINER= <fredrik@wasadata.com> > > do-install: > ${INSTALL_PROGRAM} ${WRKSRC}/tetrinet ${PREFIX}/bin > @@ -23,8 +23,6 @@ > .endif > > post-install: > - @strip ${PREFIX}/bin/tetrinet > - @strip ${PREFIX}/bin/tetrinet-server > @${ECHO} > @${CAT} ${PKGMESSAGE} > @${ECHO} > diff -urN tetrinet-old/files/patch-ab tetrinet/files/patch-ab > --- tetrinet-old/files/patch-ab Sun Mar 4 18:07:31 2001 > +++ tetrinet/files/patch-ab Sun Mar 4 17:58:21 2001 > @@ -1,10 +1,22 @@ > ---- server.orig Fri Sep 15 05:16:31 2000 > -+++ server.c Fri Feb 23 05:31:59 2001 > -@@ -9,6 +9,7 @@ > - #include <stdlib.h> > - #include <string.h> > - #include <errno.h> > +--- server.c.old Sun Mar 4 17:57:08 2001 > ++++ server.c Sun Mar 4 17:57:44 2001 > +@@ -4,6 +4,10 @@ > + * Tetrinet server code > + */ > + > +#include <sys/types.h> > - #include <netinet/in.h> > - /* Due to glibc brokenness, we can't blindly include this. Yet another > ++#include <sys/socket.h> > ++#include <sys/time.h> > ++ > + #include <stdarg.h> > + #include <stdio.h> > + #include <stdlib.h> > +@@ -14,8 +18,6 @@ > * reason to not use glibc. */ > + /* #include <netinet/protocols.h> */ > + #include <signal.h> > +-#include <sys/socket.h> > +-#include <sys/time.h> > + #include "tetrinet.h" > + #include "tetris.h" > + #include "server.h" > diff -urN tetrinet-old/files/patch-ac tetrinet/files/patch-ac > --- tetrinet-old/files/patch-ac Thu Jan 1 02:00:00 1970 > +++ tetrinet/files/patch-ac Sun Mar 4 17:58:31 2001 > @@ -0,0 +1,21 @@ > +--- sockets.c.old Sun Mar 4 17:57:04 2001 > ++++ sockets.c Sun Mar 4 17:58:02 2001 > +@@ -4,14 +4,16 @@ > + * Socket routines. > + */ > + > ++#include <sys/types.h> > ++#include <sys/socket.h> > ++#include <sys/time.h> > ++ > + #include <stdarg.h> > + #include <stdio.h> > + #include <stdlib.h> > + #include <errno.h> > + #include <netdb.h> > + #include <netinet/in.h> > +-#include <sys/socket.h> > +-#include <sys/time.h> > + #include "sockets.h" > + #include "tetrinet.h" > + > diff -urN tetrinet-old/pkg-plist tetrinet/pkg-plist > --- tetrinet-old/pkg-plist Sun Mar 4 18:07:31 2001 > +++ tetrinet/pkg-plist Sun Mar 4 18:00:09 2001 > @@ -1,5 +1,5 @@ > bin/tetrinet > bin/tetrinet-server > -share/doc/tetrinet/README > -share/doc/tetrinet/tetrinet.txt > -@dirrm share/doc/tetrinet > +%%PORTDOCS%%share/doc/tetrinet/README > +%%PORTDOCS%%share/doc/tetrinet/tetrinet.txt > +%%PORTDOCS%%@dirrm share/doc/tetrinet It looks all ok to me :) / Fredrik State Changed From-To: open->closed Committed, thanks! |
