- Take maintainership Makefile changed: +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} +COMMENT= +PORTDOCS= +DESKTOP_ENTRIES= +.include <bsd.port.options.mk> +post-install: Changed and refined: Because version 0.7.1 can't compile +PORTSCOUT= skipv:0.7.1 pkg-descr Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports) How-To-Repeat: portlint -A looks fine. port test: clean
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
When I apply your patch, I get this during 'make install': ===> Registering installation for vamos-0.7.0_3 pkg-static: duplicate file listing: /usr/local/share/doc/vamos/AUTHORS, ignoring pkg-static: duplicate file listing: /usr/local/share/doc/vamos/ChangeLog, ignoring pkg-static: duplicate file listing: /usr/local/share/doc/vamos/README, ignoring pkg-static: duplicate file listing: /usr/local/share/doc/vamos/TODO, ignoring pkg-static: duplicate directory listing: /usr/local/share/doc/vamos/, ignoring Installing vamos-0.7.0_3... done Somehow the generated plist is getting multiple entries for docs.
Responsible Changed From-To: freebsd-ports-bugs->deischen I'll take this.
If I remove all the PORTDOC entries from pkg-plist then everything seems to work without warnings. Please confirm this is correct.
- Bump portrevision - Trim Makefile header - Trim master sites - Remove leading article from COMMENT - Add Icons - Remove dependency for gmake - Add portscout - Add docs - Add Desktop entry file - Add DOCS Option - Trim pkg-descr - Trim pkg-plist Build log https://redports.org/buildarchive/20130725173701-24541/ Yes i use since some time no more PORTDOCS and EXAMPLES in pkg-plist. Only to define in Makefile is enough.
Author: deischen Date: Fri Jul 26 18:38:38 2013 New Revision: 323745 URL: http://svnweb.freebsd.org/changeset/ports/323745 Log: Change maintainer from ports@ to new maintainer. From the new maintainer: Bump portrevision Trim Makefile header Trim master sites Remove leading article from COMMENT Add Icons Remove dependency for gmake Add portscout Add docs Add Desktop entry file Add DOCS Option Trim pkg-descr Trim pkg-plist PR: 174951 Submitted by: nemysis at gmx dot ch Modified: head/games/vamos/Makefile head/games/vamos/distinfo head/games/vamos/pkg-descr head/games/vamos/pkg-plist Modified: head/games/vamos/Makefile ============================================================================== --- head/games/vamos/Makefile Fri Jul 26 18:30:21 2013 (r323744) +++ head/games/vamos/Makefile Fri Jul 26 18:38:38 2013 (r323745) @@ -1,21 +1,19 @@ -# Ports collection makefile for: vamos -# Date created: Mar 15, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= vamos PORTVERSION= 0.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= SF +MASTER_SITES= SF \ + SF/nemysisfreebsdp/:icons +DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}_icons${EXTRACT_SUFX}:icons -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 +21,32 @@ USE_OPENAL= al alut 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 -INFO= vamos - CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +# Wrong versioning upstream +PORTSCOUT= skipv:0.7.1 + +INFO= vamos + +PORTDOCS= AUTHORS ChangeLog README TODO + +INSTALLS_ICONS= yes +ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 + +DESKTOP_ENTRIES="Vamos" "${COMMENT}" ${PORTNAME} \ + "${PORTNAME}" "Game;ArcadeGame;" false + +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-extract: @${CHMOD} ${BINMODE} ${WRKSRC}/config/install-sh @@ -46,4 +58,17 @@ post-patch: /^AM_CXXFLAGS/s| -DBOOST_TEST_DYN_LINK|| ; \ /^AM_CXXFLAGS/s| -L/usr/lib/boost||' +post-install: +.for s in ${ICON_SIZES} + ${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ + ${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png +.endfor + ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps + +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} +.endif + .include <bsd.port.mk> Modified: head/games/vamos/distinfo ============================================================================== --- head/games/vamos/distinfo Fri Jul 26 18:30:21 2013 (r323744) +++ head/games/vamos/distinfo Fri Jul 26 18:38:38 2013 (r323745) @@ -1,2 +1,4 @@ SHA256 (vamos-0.7.0.tar.gz) = ee4d6bf92c1769ed1cf47cb000316df02815dc866f91e22450d1a008f65d6af9 SIZE (vamos-0.7.0.tar.gz) = 1648589 +SHA256 (vamos_icons.tar.gz) = 52bc6a4fea63c8a23a76b059ee942dda6738483e04d1e5afb10a8184f875f803 +SIZE (vamos_icons.tar.gz) = 15360 Modified: head/games/vamos/pkg-descr ============================================================================== --- head/games/vamos/pkg-descr Fri Jul 26 18:30:21 2013 (r323744) +++ head/games/vamos/pkg-descr Fri Jul 26 18:38:38 2013 (r323745) @@ -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/ Modified: head/games/vamos/pkg-plist ============================================================================== --- head/games/vamos/pkg-plist Fri Jul 26 18:30:21 2013 (r323744) +++ head/games/vamos/pkg-plist Fri Jul 26 18:38:38 2013 (r323745) @@ -70,6 +70,12 @@ lib/libvamos-world.a lib/libvamos-world.la lib/libvamos-world.so lib/libvamos-world.so.0 +share/icons/hicolor/32x32/apps/vamos.png +share/icons/hicolor/48x48/apps/vamos.png +share/icons/hicolor/64x64/apps/vamos.png +share/icons/hicolor/72x72/apps/vamos.png +share/icons/hicolor/96x96/apps/vamos.png +share/pixmaps/vamos.png %%DATADIR%%/cars/F1-1967-arm.ac %%DATADIR%%/cars/F1-1967-interior.ac %%DATADIR%%/cars/F1-1967-stator.ac _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Patch committed. Thanks for your contribution!