Bug 172302 - [PATCH] graphics/viewnior : fix pkg-plist when installing NLS files
Summary: [PATCH] graphics/viewnior : fix pkg-plist when installing NLS files
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Guido Falsi
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-10-03 12:30 UTC by Guido Falsi
Modified: 2012-10-03 18:50 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (2.39 KB, patch)
2012-10-03 12:30 UTC, Guido Falsi
no flags Details | Diff
viewnior.diff (4.90 KB, patch)
2012-10-03 15:22 UTC, nemysis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Guido Falsi freebsd_committer freebsd_triage 2012-10-03 12:30:15 UTC
While testing some ports with pkgng I noticed that the viewnior pkg-plist has a problem.

It's trying to rm files from ${PREFIX}/lib/locale and also removing
NLS directories which are part of the standard mtree.

This slipped by me when originally committing the port unluckily.

Attached patch fixes it. Patch also strips Makefile headers and bumps PORTREVISION.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-10-03 12:30:23 UTC
Maintainer of graphics/viewnior,

Please note that PR ports/172302 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/172302

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2012-10-03 12:30:27 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Guido Falsi freebsd_committer freebsd_triage 2012-10-03 13:08:21 UTC
Responsible Changed
From-To: freebsd-ports-bugs->madpilot

I'll take it.
Comment 4 nemysis 2012-10-03 15:22:01 UTC
portlint -A
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
WARN: Makefile: new ports should not set PORTREVISION.
WARN: Makefile: only one MASTER_SITE configured.  Consider adding additional mirrors.
0 fatal errors and 3 warnings found.


port test: clean

Makefile changed

+COMMENT=       Fast and simple image viewer

+MAN1=          ${PORTNAME}.1


Because is defined in /usr/ports/KNOBS

-NLS_DESC=      Native Language Support via gettext

Removed and simplified

# Documentation


Changed pkg-plist to clean deinstall
Comment 5 dfilter service freebsd_committer freebsd_triage 2012-10-03 18:46:20 UTC
Author: madpilot
Date: Wed Oct  3 17:46:09 2012
New Revision: 305213
URL: http://svn.freebsd.org/changeset/ports/305213

Log:
  - Fix plist for NLS case
  - Trim Makefile headers
  - Clean up COMMENT
  - Use standard description for NLS option
  - Rework post-install target
  - Bump PORTREVISION
  
  PR:		ports/172302
  Submitted by:	Guido Falsi <madpilot@FreeBSD.org>
  Approved by:	nemysis <nemysis@gmx.ch> (maintainer, via IRC)

Modified:
  head/graphics/viewnior/Makefile
  head/graphics/viewnior/pkg-plist   (contents, props changed)

Modified: head/graphics/viewnior/Makefile
==============================================================================
--- head/graphics/viewnior/Makefile	Wed Oct  3 16:35:21 2012	(r305212)
+++ head/graphics/viewnior/Makefile	Wed Oct  3 17:46:09 2012	(r305213)
@@ -1,18 +1,14 @@
-# New Ports collection makefile for:	viewnior
-# Date created:		2012-04-20
-# Whom:			nemysis@gmx.ch
-#
+# Created by: nemysis@gmx.ch
 # $FreeBSD$
-#
 
 PORTNAME=	viewnior
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cloud.github.com/downloads/xsisqox/Viewnior/
 
 MAINTAINER=	nemysis@gmx.ch
-COMMENT=	Viewnior is a fast and simple image viewer
+COMMENT=	Fast and simple image viewer
 
 LICENSE=	GPLv3
 
@@ -30,7 +26,6 @@ MAN1=		viewnior.1
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 
 OPTIONS_DEFINE=	NLS
-NLS_DESC=	Native Language Support via gettext
 OPTIONS_DEFAULT=	NLS
 
 .include <bsd.port.options.mk>
@@ -45,12 +40,9 @@ PLIST_SUB+=	NLS="@comment "
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/${MAN1} ${MAN1PREFIX}/man/man1
-# Documentation
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-.  for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.  endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/graphics/viewnior/pkg-plist
==============================================================================
--- head/graphics/viewnior/pkg-plist	Wed Oct  3 16:35:21 2012	(r305212)
+++ head/graphics/viewnior/pkg-plist	Wed Oct  3 17:46:09 2012	(r305213)
@@ -55,56 +55,5 @@ share/icons/hicolor/scalable/apps/viewni
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrmtry share/applications
-@dirrmtry lib/locale/zh_CN/LC_MESSAGES
-@dirrmtry lib/locale/zh_CN
-@dirrmtry lib/locale/uk/LC_MESSAGES
-@dirrmtry lib/locale/uk
-@dirrmtry lib/locale/tr/LC_MESSAGES
-@dirrmtry lib/locale/tr
-@dirrmtry lib/locale/sv/LC_MESSAGES
-@dirrmtry lib/locale/sv
-@dirrmtry lib/locale/sr/LC_MESSAGES
-@dirrmtry lib/locale/sr
-@dirrmtry lib/locale/sk/LC_MESSAGES
-@dirrmtry lib/locale/sk
-@dirrmtry lib/locale/ru/LC_MESSAGES
-@dirrmtry lib/locale/ru
-@dirrmtry lib/locale/pt_BR/LC_MESSAGES
-@dirrmtry lib/locale/pt_BR
-@dirrmtry lib/locale/pt/LC_MESSAGES
-@dirrmtry lib/locale/pt
-@dirrmtry lib/locale/pl/LC_MESSAGES
-@dirrmtry lib/locale/pl
-@dirrmtry lib/locale/oc/LC_MESSAGES
-@dirrmtry lib/locale/oc
-@dirrmtry lib/locale/nl/LC_MESSAGES
-@dirrmtry lib/locale/nl
-@dirrmtry lib/locale/lt/LC_MESSAGES
-@dirrmtry lib/locale/lt
-@dirrmtry lib/locale/ja/LC_MESSAGES
-@dirrmtry lib/locale/ja
-@dirrmtry lib/locale/it/LC_MESSAGES
-@dirrmtry lib/locale/it
-@dirrmtry lib/locale/hu/LC_MESSAGES
-@dirrmtry lib/locale/hu
-@dirrmtry lib/locale/he/LC_MESSAGES
-@dirrmtry lib/locale/he
-@dirrmtry lib/locale/gl/LC_MESSAGES
-@dirrmtry lib/locale/gl
-@dirrmtry lib/locale/fr/LC_MESSAGES
-@dirrmtry lib/locale/fr
-@dirrmtry lib/locale/fi/LC_MESSAGES
-@dirrmtry lib/locale/fi
-@dirrmtry lib/locale/es/LC_MESSAGES
-@dirrmtry lib/locale/es
-@dirrmtry lib/locale/el/LC_MESSAGES
-@dirrmtry lib/locale/el
-@dirrmtry lib/locale/de/LC_MESSAGES
-@dirrmtry lib/locale/de
-@dirrmtry lib/locale/da/LC_MESSAGES
-@dirrmtry lib/locale/da
-@dirrmtry lib/locale/cs/LC_MESSAGES
-@dirrmtry lib/locale/cs
-@dirrmtry lib/locale/bg/LC_MESSAGES
-@dirrmtry lib/locale/bg
-@dirrmtry lib/locale
+%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/oc
_______________________________________________
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"
Comment 6 Guido Falsi freebsd_committer freebsd_triage 2012-10-03 18:46:21 UTC
State Changed
From-To: feedback->closed

Committed, with minor changes. Thanks!