From nobody@FreeBSD.org  Wed Apr  3 10:58:18 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 75A063DC
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  3 Apr 2013 10:58:18 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 667B363C
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  3 Apr 2013 10:58:18 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r33AwIUP008609
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 3 Apr 2013 10:58:18 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r33AwIMP008608;
	Wed, 3 Apr 2013 10:58:18 GMT
	(envelope-from nobody)
Message-Id: <201304031058.r33AwIMP008608@red.freebsd.org>
Date: Wed, 3 Apr 2013 10:58:18 GMT
From: John Marino <draco@marino.st>
To: freebsd-gnats-submit@FreeBSD.org
Subject: security/switzerland: [PATCH] bad plist prevents packaging
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         177605
>Category:       ports
>Synopsis:       security/switzerland: [PATCH] bad plist prevents packaging
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 03 11:00:00 UTC 2013
>Closed-Date:    Sat Apr 06 23:22:50 UTC 2013
>Last-Modified:  Sat Apr  6 23:30:00 UTC 2013
>Originator:     John Marino
>Release:        
>Organization:
>Environment:
>Description:
Due to using a directory in the plist, pkg produces an empty package of switzerland with no manifest. Fix attached.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- pkg-plist.orig	2013-01-04 22:25:00.608277000 +0000
+++ pkg-plist
@@ -77,8 +77,6 @@ bin/switzerland-server
 %%PYTHON_SITELIBDIR%%/switzerland/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/switzerland/lib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/switzerland/lib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy
-%%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy
 %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/__init__.py
 %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/__init__.pyc
 %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/__init__.pyo
@@ -100,8 +98,6 @@ bin/switzerland-server
 %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/fields.py
 %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/fields.pyc
 %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/fields.pyo
-%%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/layers
-%%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/layers
 %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/layers/__init__.py
 %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/layers/__init__.pyc
 %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/layers/__init__.pyo


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Wed Apr 3 15:06:29 UTC 2013 
Responsible-Changed-Why:  
ports PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177605 
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Sat Apr 6 20:52:44 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177605 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Sat Apr 6 23:22:49 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177605 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177605: commit references a PR
Date: Sat,  6 Apr 2013 23:22:34 +0000 (UTC)

 Author: wg
 Date: Sat Apr  6 23:22:20 2013
 New Revision: 315749
 URL: http://svnweb.freebsd.org/changeset/ports/315749
 
 Log:
   - Fix pkg-plist [1]
   - Trim Makefile header
   - Use OptionsNG DOCS
   
   PR:		ports/177605 [1]
   Submitted by:	John Marino <draco@marino.st> [1]
   Approved by:	portmgr (miwi), jpaetzel (mentor)
 
 Modified:
   head/security/switzerland/Makefile
   head/security/switzerland/pkg-plist
 
 Modified: head/security/switzerland/Makefile
 ==============================================================================
 --- head/security/switzerland/Makefile	Sat Apr  6 23:20:30 2013	(r315748)
 +++ head/security/switzerland/Makefile	Sat Apr  6 23:22:20 2013	(r315749)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	Switzerland
 -# Date created:				08/08/08
 -# Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
 -#
 +# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	switzerland
  PORTVERSION=	0.1.0
 @@ -18,13 +14,15 @@ USE_PYTHON=	yes
  USE_PYDISTUTILS=	yes
  PORTDOCS=	*
  
 +.include <bsd.port.options.mk>
 +
  post-patch:
  	@${REINPLACE_CMD} -e 's,gcc -O3,${CC} ${CFLAGS}, ; \
  		s,"Switzerland","switzerland", ; \
  		s,"0\.0","${PORTVERSION}",' ${WRKSRC}/setup.py
  
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	@${MKDIR} ${DOCSDIR}
  	${INSTALL_DATA} ${WRKSRC}/BUGS.txt ${WRKSRC}/README.txt \
  		${WRKSRC}/doc/* ${DOCSDIR}
 
 Modified: head/security/switzerland/pkg-plist
 ==============================================================================
 --- head/security/switzerland/pkg-plist	Sat Apr  6 23:20:30 2013	(r315748)
 +++ head/security/switzerland/pkg-plist	Sat Apr  6 23:22:20 2013	(r315749)
 @@ -77,8 +77,6 @@ bin/switzerland-server
  %%PYTHON_SITELIBDIR%%/switzerland/lib/__init__.py
  %%PYTHON_SITELIBDIR%%/switzerland/lib/__init__.pyc
  %%PYTHON_SITELIBDIR%%/switzerland/lib/__init__.pyo
 -%%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy
 -%%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy
  %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/__init__.py
  %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/__init__.pyc
  %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/__init__.pyo
 @@ -100,8 +98,6 @@ bin/switzerland-server
  %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/fields.py
  %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/fields.pyc
  %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/fields.pyo
 -%%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/layers
 -%%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/layers
  %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/layers/__init__.py
  %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/layers/__init__.pyc
  %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/layers/__init__.pyo
 _______________________________________________
 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"
 
>Unformatted:
