- Update to 1.1.0

PR:		123872
Submitted by:	Ports Fury

5 files changed, 36 insertions, 59 deletions

diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile
index 69a0b7342b43..26b36880d018 100644
--- a/games/gnurobots/Makefile
+++ b/games/gnurobots/Makefile
@@ -6,36 +6,29 @@
 #
 
 PORTNAME=	gnurobots
-PORTVERSION=	1.0D
-PORTREVISION=	3
+PORTVERSION=	1.1.0
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	gnurobots
+MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU diversion wherein Scheme-coded robots explore a world
 
 LIB_DEPENDS=	guile.18:${PORTSDIR}/lang/guile
 
-GNU_CONFIGURE=	yes
 USE_XORG=	x11 xpm
+USE_GNOME=	gnometarget glib20
+GNU_CONFIGURE=	yes
 
-pre-patch:
-	${CP} ${WRKSRC}/getopt/getopt.h ${WRKSRC}/include
-	${CP} ${WRKSRC}/getopt/getopt.c ${WRKSRC}/src
-	${CP} ${WRKSRC}/getopt/getopt1.c ${WRKSRC}/src
-
-do-install:
-	${MKDIR} ${PREFIX}/share/gnurobots/maps ${PREFIX}/share/gnurobots/scheme \
-		${PREFIX}/share/doc/gnurobots
-	${INSTALL_PROGRAM} ${WRKSRC}/src/robots ${PREFIX}/bin/gnurobots
-	${INSTALL_PROGRAM} ${WRKSRC}/src/robots_logfile ${PREFIX}/bin/gnurobots_logfile
-	${INSTALL_PROGRAM} ${WRKSRC}/src/xrobots ${PREFIX}/bin/xgnurobots
-	${INSTALL_DATA} ${WRKSRC}/maps/* ${PREFIX}/share/gnurobots/maps/
-	${INSTALL_DATA} ${WRKSRC}/scheme/* ${PREFIX}/share/gnurobots/scheme/
-	${INSTALL_MAN} ${WRKSRC}/doc/* ${PREFIX}/share/doc/gnurobots/
+post-patch:
+	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure
 
 post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for f in AUTHORS ChangeLog NEWS README THANKS doc/Robots-HOWTO doc/contrib
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
+.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/games/gnurobots/distinfo b/games/gnurobots/distinfo
index 258d57939180..5f991a297912 100644
--- a/games/gnurobots/distinfo
+++ b/games/gnurobots/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnurobots-1.0D.tar.gz) = 0ced682367b0dc9b2fcfdb40230a5fb5
-SHA256 (gnurobots-1.0D.tar.gz) = 1d4b4148b1f156961b49417f628dbbf097ab2a3548de171cf9d6d314bb54ea2d
-SIZE (gnurobots-1.0D.tar.gz) = 71850
+MD5 (gnurobots-1.1.0.tar.gz) = 3380e1424f9fce2403693f896f228f18
+SHA256 (gnurobots-1.1.0.tar.gz) = 12d8d0811020def12302ebfab2c9936e9ab5c5f4879588e66e4badca93fff86b
+SIZE (gnurobots-1.1.0.tar.gz) = 392948
diff --git a/games/gnurobots/files/patch-aa b/games/gnurobots/files/patch-aa
deleted file mode 100644
index 7aab72876e49..000000000000
--- a/games/gnurobots/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in	Sun Jun 18 11:26:24 2000
-+++ src/Makefile.in	Fri Sep 22 01:12:42 2000
-@@ -17,7 +17,7 @@
- 
- # Macros:
- 
--SOURCES=api.c sign.c loadmap.c drawmap.c
-+SOURCES=api.c sign.c loadmap.c drawmap.c getopt.c getopt1.c
- OBJECTS=$(SOURCES:.c=.o)
- 
- CFLAGS_X=@X_CFLAGS@
diff --git a/games/gnurobots/pkg-message b/games/gnurobots/pkg-message
index 74ef86a04f21..c07a6ac3ba11 100644
--- a/games/gnurobots/pkg-message
+++ b/games/gnurobots/pkg-message
@@ -2,6 +2,4 @@ Where to find things
   - A place to start: $PREFIX/share/doc/gnurobots/Robots-HOWTO
   - Example maps:     $PREFIX/share/gnurobots/maps/
   - Example robots:   $PREFIX/share/gnurobots/scheme/
-  - Binaries:         gnurobots, gnurobots_logfile, xgnurobots
-                      (this port adds the 'gnu' prefix to
-                       distinguish from /usr/games/robots)
+  - Binaries:         gnurobots
diff --git a/games/gnurobots/pkg-plist b/games/gnurobots/pkg-plist
index b3d36ef52a41..8d8a9b5dcdd7 100644
--- a/games/gnurobots/pkg-plist
+++ b/games/gnurobots/pkg-plist
@@ -1,24 +1,21 @@
 bin/gnurobots
-bin/gnurobots_logfile
-bin/xgnurobots
-share/gnurobots/maps/maze.map
-share/gnurobots/maps/pattern.map
-share/gnurobots/maps/small.map
-share/gnurobots/scheme/beep.scm
-share/gnurobots/scheme/greedy.scm
-share/gnurobots/scheme/mapper.scm
-share/gnurobots/scheme/simple.scm
-share/gnurobots/scheme/stop.scm
-share/gnurobots/scheme/zap.scm
-share/doc/gnurobots/BUGS
-share/doc/gnurobots/COPYING
-share/doc/gnurobots/INSTALL
-share/doc/gnurobots/NEWS
-share/doc/gnurobots/README
-share/doc/gnurobots/Robots-HOWTO
-share/doc/gnurobots/contrib
-share/doc/gnurobots/guile-proj.scm
-@dirrm share/gnurobots/scheme
-@dirrm share/gnurobots/maps
-@dirrm share/gnurobots
-@dirrm share/doc/gnurobots
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/Robots-HOWTO
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/contrib
+%%DATADIR%%/maps/maze.map
+%%DATADIR%%/maps/pattern.map
+%%DATADIR%%/maps/small.map
+%%DATADIR%%/scheme/beep.scm
+%%DATADIR%%/scheme/greedy.scm
+%%DATADIR%%/scheme/mapper.scm
+%%DATADIR%%/scheme/simple.scm
+%%DATADIR%%/scheme/stop.scm
+%%DATADIR%%/scheme/zap.scm
+@dirrm %%DATADIR%%/scheme
+@dirrm %%DATADIR%%/maps
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%