Date: Thu, 14 Mar 2013 03:30:01 GMT From: nemysis <nemysis@gmx.ch> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/174951: [PATCH] games/vamos: added OptionsNG, icon, desktop entry, documentation, take maintainership Message-ID: <201303140330.r2E3U1ax034736@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/174951; it has been noted by GNATS.
From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/174951: [PATCH] games/vamos: added OptionsNG, icon,
desktop entry, documentation, take maintainership
Date: Thu, 14 Mar 2013 04:20:32 +0100
--MP_/yd.aC7s4m=CfH_QoVg0kTP9
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Makefile Header adjusted
Port is now safe with NOPORTDOCS=yes in /etc/make.conf
+OPTIONS_DEFINE= DOCS
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_SUB+= PORTDOCS=""
+.else
+PLIST_SUB+= PORTDOCS="@comment "
+.endif
Changed and refined:
pkg-plist
--MP_/yd.aC7s4m=CfH_QoVg0kTP9
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=vamos.diff
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/games/vamos/Makefile ./Makefile
--- /usr/ports/games/vamos/Makefile 2013-01-14 17:55:26.000000000 +0100
+++ ./Makefile 2013-03-14 04:07:59.000000000 +0100
@@ -1,21 +1,21 @@
-# Ports collection makefile for: vamos
-# Date created: Mar 15, 2002
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD: head/games/vamos/Makefile 302037 2012-08-04 22:52:02Z kwm $
-#
PORTNAME= vamos
PORTVERSION= 0.7.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF \
+ http://${PORTNAME}.sourceforge.net/images/:icons
+DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+ logo.png:icons
+DIST_SUBDIR= ${PORTNAME}
+EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
-MAINTAINER= ports@FreeBSD.org
-COMMENT= An automotive simulation framework
+MAINTAINER= nemysis@gmx.ch
+COMMENT= Automotive simulation framework
LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
@@ -23,18 +23,36 @@
USE_XORG= sm ice x11 xi xext xmu
USE_GL= glut
USE_SDL= sdl
-USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= ac_cv_header_boost_test_unit_test_hpp=no \
ac_cv_lib_freeglut_glutGetModifiers=no
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
+# Wrong versioning upstream
+PORTSCOUT= skipv:0.7.1
+
INFO= vamos
+PORTDOCS= AUTHORS ChangeLog README TODO
+
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+DESKTOP_ENTRIES="Vamos" "${COMMENT}" \
+ share/pixmaps/${PORTNAME}.png \
+ "${PORTNAME}" "Game;ArcadeGame;" false
+
+OPTIONS_DEFINE= DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_SUB+= PORTDOCS=""
+.else
+PLIST_SUB+= PORTDOCS="@comment "
+.endif
+
post-extract:
@${CHMOD} ${BINMODE} ${WRKSRC}/config/install-sh
@@ -46,4 +64,12 @@
/^AM_CXXFLAGS/s| -DBOOST_TEST_DYN_LINK|| ; \
/^AM_CXXFLAGS/s| -L/usr/lib/boost||'
+post-install:
+ ${INSTALL_DATA} ${_DISTDIR}/logo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/vamos/distinfo ./distinfo
--- /usr/ports/games/vamos/distinfo 2013-01-14 17:55:26.000000000 +0100
+++ ./distinfo 2013-03-14 04:08:33.000000000 +0100
@@ -1,2 +1,4 @@
-SHA256 (vamos-0.7.0.tar.gz) = ee4d6bf92c1769ed1cf47cb000316df02815dc866f91e22450d1a008f65d6af9
-SIZE (vamos-0.7.0.tar.gz) = 1648589
+SHA256 (vamos/vamos-0.7.0.tar.gz) = ee4d6bf92c1769ed1cf47cb000316df02815dc866f91e22450d1a008f65d6af9
+SIZE (vamos/vamos-0.7.0.tar.gz) = 1648589
+SHA256 (vamos/logo.png) = 35de29102eb60ad619192137ec0e2b0139968c6dd0c4b634e17b61fc2d68e060
+SIZE (vamos/logo.png) = 2560
diff -ruN --exclude=CVS /usr/ports/games/vamos/pkg-descr ./pkg-descr
--- /usr/ports/games/vamos/pkg-descr 2013-01-14 17:55:26.000000000 +0100
+++ ./pkg-descr 2013-01-03 13:09:38.000000000 +0100
@@ -1,5 +1,5 @@
Vamos is an automotive simulation framework with an emphasis on thorough
-physical modeling and good C++ design. Vamos includes a real-time, first-
-person, 3D driving application.
+physical modeling and good C++ design. Vamos includes a real-time,
+first-person, 3D driving application.
WWW: http://vamos.sourceforge.net/
diff -ruN --exclude=CVS /usr/ports/games/vamos/pkg-plist ./pkg-plist
--- /usr/ports/games/vamos/pkg-plist 2013-01-14 17:55:26.000000000 +0100
+++ ./pkg-plist 2013-03-14 04:12:19.000000000 +0100
@@ -70,6 +70,11 @@
lib/libvamos-world.la
lib/libvamos-world.so
lib/libvamos-world.so.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+share/pixmaps/vamos.png
%%DATADIR%%/cars/F1-1967-arm.ac
%%DATADIR%%/cars/F1-1967-interior.ac
%%DATADIR%%/cars/F1-1967-stator.ac
@@ -199,6 +204,7 @@
@dirrm %%DATADIR%%/controls
@dirrm %%DATADIR%%/cars
@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/vamos/world
@dirrm include/vamos/track
@dirrm include/vamos/media
===> Done
--MP_/yd.aC7s4m=CfH_QoVg0kTP9--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303140330.r2E3U1ax034736>