From linimon@lonesome.com  Fri Jul 29 20:52:51 2011
Return-Path: <linimon@lonesome.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 81708106566C
	for <bug-followup@FreeBSD.org>; Fri, 29 Jul 2011 20:52:51 +0000 (UTC)
	(envelope-from linimon@lonesome.com)
Received: from mail.soaustin.net (pancho.soaustin.net [76.74.250.40])
	by mx1.freebsd.org (Postfix) with ESMTP id 4A47D8FC0A
	for <bug-followup@FreeBSD.org>; Fri, 29 Jul 2011 20:52:51 +0000 (UTC)
Received: by mail.soaustin.net (Postfix, from userid 502)
	id D54495619E; Fri, 29 Jul 2011 15:52:50 -0500 (CDT)
Message-Id: <20110729205250.GD21217@lonesome.com>
Date: Fri, 29 Jul 2011 15:52:50 -0500
From: Mark Linimon <linimon@lonesome.com>
To: bug-followup@FreeBSD.org
Subject:

>Number:         159301
>Category:       junk
>Synopsis:       linimon fat-fingered a followup
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    gnats-admin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 29 21:00:21 UTC 2011
>Closed-Date:    Sat Jul 30 02:38:39 UTC 2011
>Last-Modified:  Sat Jul 30 02:38:39 UTC 2011
>Originator:     
>Release:        
>Organization:
>Environment:
>Description:
 ----- Forwarded message from Nick Hilliard <nick@foobar.org> -----
 
 Date: Fri, 29 Jul 2011 20:59:38 +0100
 From: Nick Hilliard <nick@foobar.org>
 To: Chris Rees <crees@freebsd.org>
 CC: portmgr@FreeBSD.org
 Subject: Re: ports/153795: repocopy www/drupal5/bsd.drupal.mk to Mk/bsd.drupal.mk
 
 On 28/07/2011 22:16, crees@FreeBSD.org wrote:
 > Please would you submit a patch rather than the complete file?
 
 see attached.
 
 Nick
 
 
 --- bsd.drupal.mk.old	2011-07-29 20:56:56.000000000 +0100
 +++ bsd.drupal.mk	2011-07-29 20:56:18.000000000 +0100
 @@ -1,22 +1,29 @@
 -#-*- mode: makefile; tab-width: 4; -*-
 -: ex:ts=4
 +# $FreeBSD: ports/www/drupal5/bsd.drupal.mk,v 1.9 2009/04/04 18:00:28 miwi Exp $
  #
 -# $FreeBSD: ports/Mk/bsd.drupal.mk,v 1.10 2011/07/29 08:46:50 crees Exp $
 -#
 -# bsd.drupal.mk - Support for Drupal ports and modules.
 -#
 -# For FreeBSD committers:
 -# Please send all suggested changes to the maintainer instead of committing
 -# them to CVS yourself.
 -
 -bsd_drupal_mk_MAINTAINER=	nick@foobar.org
  
  # Make sure we cannot define any combination of DRUPAL{5,6}
  .if (defined(DRUPAL5_MODULE) && defined(DRUPAL6_MODULE))
  BROKEN=		cannot define a combination of DRUPAL5_MODULE and DRUPAL6_MODULE
  .endif
  
 -# Make sure DRUPAL_MODULE is defined.  If no DRUPAL*_module defined, then define DRUPAL4_MODULE
 +.if (defined(DRUPAL5_THEME) && defined(DRUPAL6_THEME))
 +BROKEN=		cannot define a combination of DRUPAL5_THEME and DRUPAL6_THEME
 +.endif
 +
 +# Make sure DRUPAL_VERSION is defined for old module versions
 +.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_PORT)  || defined(DRUPAL5_THEME)
 +DRUPAL_VERSION?=	5
 +.endif
 +
 +.if defined(DRUPAL6_MODULE) || defined(DRUPAL6_PORT)  || defined(DRUPAL6_THEME)
 +DRUPAL_VERSION?=	6
 +.endif
 +
 +.if !defined(DRUPAL_VERSION)
 +BROKEN=		must define DRUPAL_VERSION
 +.endif
 +
 +# Make sure DRUPAL_MODULE is defined where necessary
  .if defined(DRUPAL5_MODULE) || defined(DRUPAL6_MODULE)
  DRUPAL_MODULE?=	yes
  .endif
 @@ -25,23 +32,25 @@
  DRUPAL_MODTYPE=	modules
  .endif
  
 -# Make sure DRUPAL_PORT is defined.  If no DRUPAL*_module defined, then define DRUPAL4_PORT
 +# Make sure DRUPAL_PORT is defined where necessary
  .if defined(DRUPAL5_PORT) || defined(DRUPAL6_PORT)
  DRUPAL_PORT?=	yes
  .endif
  
 -# Make sure DRUPAL_THEME is defined
 +# Make sure DRUPAL_THEME is defined where necessary
  .if defined(DRUPAL5_THEME) || defined(DRUPAL6_THEME)
  DRUPAL_THEME?=	yes
  DRUPAL_MODTYPE=	themes
  .endif
  
 -.if defined(DRUPAL6_MODULE) || defined(DRUPAL6_PORT) || defined(DRUPAL6_THEME)
 +.if ${DRUPAL_VERSION} == "7"
 +DRUPAL_BASE?=   www/drupal7
 +.elif ${DRUPAL_VERSION} == "6"
  DRUPAL_BASE?=   www/drupal6
 -.else
 -.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_PORT) || defined(DRUPAL5_THEME)
 +.elif ${DRUPAL_VERSION} == "5"
  DRUPAL_BASE?=	www/drupal5
 -.endif
 +.else
 +BROKEN=		Unknown DRUPAL_VERSION (${DRUPAL_VERSION})
  .endif
  
  DRUPAL_DIR=	${PREFIX}/${DRUPAL_BASE}
 @@ -54,27 +63,20 @@
  .endif
  
  .if defined(DRUPAL_MODULE) || defined (DRUPAL_THEME)
 +PKGNAMEPREFIX=  drupal${DRUPAL_VERSION}-
  
 +# drupal contributions must be licensed under the GPLv2 or GPLv3.  This is
 +# documented at: http://drupal.org/licensing/faq/
 +LICENSE?=	GPLv2 GPLv3
 +LICENSE_COMB?=	dual
  
 -.if defined(DRUPAL5_MODULE) || defined (DRUPAL5_THEME)
 -PKGNAMEPREFIX=	drupal5-
 -DRUPAL_VERSION?=	5.0
  .if defined(DRUPAL_MODSUBDIR)
  DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${DRUPAL_MODTYPE}/${DRUPAL_MODSUBDIR}
  .else
  DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${DRUPAL_MODTYPE}/${PORTNAME}
  .endif
 -.endif
  
 -.if defined(DRUPAL6_MODULE) || defined (DRUPAL6_THEME)
 -PKGNAMEPREFIX=	drupal6-
 -DRUPAL_VERSION?=	6.0
 -.if defined(DRUPAL_MODSUBDIR)
 -DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${DRUPAL_MODTYPE}/${DRUPAL_MODSUBDIR}
 -.else
 -DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${DRUPAL_MODTYPE}/${PORTNAME}
 -.endif
 -.endif
 +DRUPAL_MODLIB?=	${DRUPAL_BASE}/sites/all/libraries
  
  DOCSDIR?=	${DRUPAL_DOCSDIR}/${PORTNAME}
  
 @@ -112,7 +114,7 @@
  PLIST_FILES+=	${MODULE_FILES:C|^|%%DRUPAL_MODDIR%%/|}
  PLIST_FILES+=	${MODULE_CONF_FILES:C|^|%%DRUPAL_MODDIR%%/|:C|$|-dist|}
  PLIST_DIRS+=	${MODULE_DIRS:C|^|%%DRUPAL_MODDIR%%/|}
 -.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_THEME)  || defined(DRUPAL6_MODULE) || defined(DRUPAL6_THEME)
 +.if defined(DRUPAL_MODULE) || defined(DRUPAL_THEME)
  PLIST_DIRS+=	${DRUPAL_MODDIR}
  .endif
  .if defined(DRUPAL_MODSUBDIR)
 @@ -125,7 +127,7 @@
  .endif
  
  do-install:
 -.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_THEME) || defined(DRUPAL6_MODULE) || defined(DRUPAL6_THEME)
 +.if defined(DRUPAL_MODULE) || defined(DRUPAL_THEME)
  	@${MKDIR} ${DRUPAL_MODDIR:C|^|${PREFIX}/|}
  	@${CHOWN} ${WWWOWN}:${WWWGRP} ${DRUPAL_MODDIR:C|^|${PREFIX}/|}
  .endif
 
 
 ----- End forwarded message -----
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Sat Jul 30 02:38:10 UTC 2011 
State-Changed-Why:  
Already fixed in appropriate PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159301 
>Unformatted:
