From jarrod@manhattan.downtools.com.au  Tue Nov  9 13:05:11 2010
Return-Path: <jarrod@manhattan.downtools.com.au>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B19B51065673
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  9 Nov 2010 13:05:11 +0000 (UTC)
	(envelope-from jarrod@manhattan.downtools.com.au)
Received: from manhattan.downtools.com.au (manhattan.downtools.com.au [123.136.33.242])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B59A8FC1B
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  9 Nov 2010 13:05:10 +0000 (UTC)
Received: from manhattan.downtools.com.au (localhost [127.0.0.1])
	by manhattan.downtools.com.au (8.14.3/8.14.3) with ESMTP id oA9CTpMc020120;
	Tue, 9 Nov 2010 22:59:51 +1030 (CST)
	(envelope-from jarrod@manhattan.downtools.com.au)
Received: (from jarrod@localhost)
	by manhattan.downtools.com.au (8.14.3/8.14.3/Submit) id oA9CTpu7020119;
	Tue, 9 Nov 2010 22:59:51 +1030 (CST)
	(envelope-from jarrod)
Message-Id: <201011091229.oA9CTpu7020119@manhattan.downtools.com.au>
Date: Tue, 9 Nov 2010 22:59:51 +1030 (CST)
From: Jarrod Sayers <jarrod@downtools.com.au>
Reply-To: Jarrod Sayers <jarrod@downtools.com.au>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] databases/mysql51-server: Remove lib/mysql/plugin directory when built with BUILD_STATIC knob
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         152076
>Category:       ports
>Synopsis:       [patch] databases/mysql51-server: Remove lib/mysql/plugin directory when built with BUILD_STATIC knob
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 09 13:10:09 UTC 2010
>Closed-Date:    Tue Nov 23 08:30:41 UTC 2010
>Last-Modified:  Tue Nov 23 08:30:41 UTC 2010
>Originator:     Jarrod Sayers
>Release:        FreeBSD 7.2-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD manhattan.downtools.com.au 7.2-RELEASE-p4 FreeBSD 7.2-RELEASE-p4 #18: Sat Oct 3 19:20:23 CST 2009 root@manhattan.netleader.com.au:/usr/obj/usr/src/sys/MANHATTAN i386
>Description:
When built with the BUILD_STATIC knob, plugins are compiled statically in to the
mysqld binary, however, the installation process still creates the plugin
directory.  This directory remains empty and is not removed when the package is
deinstalled due to the expansion of %%PLUGINS%% to @comment.

===>  Installing for mysql-server-5.1.52
===>   mysql-server-5.1.52 depends on shared library: mysqlclient.16 - found
===>   Generating temporary packing list
===>  Checking if databases/mysql51-server already installed
===> Creating users and/or groups.
Using existing group `mysql'.
Using existing user `mysql'.
[removed]
Making install in archive
test -z "/usr/local/lib/mysql/plugin" || ../.././install-sh -c -d "/usr/local/lib/mysql/plugin"
Making install in blackhole
test -z "/usr/local/lib/mysql/plugin" || ../.././install-sh -c -d "/usr/local/lib/mysql/plugin"
Making install in csv
test -z "/usr/local/lib/mysql" || ../.././install-sh -c -d "/usr/local/lib/mysql"
Making install in federated
test -z "/usr/local/lib/mysql/plugin" || ../.././install-sh -c -d "/usr/local/lib/mysql/plugin"
Making install in heap
test -z "/usr/local/lib/mysql" || ../.././install-sh -c -d "/usr/local/lib/mysql"
 install  -o root -g wheel -m 444 'libheap.a' '/usr/local/lib/mysql/libheap.a'
 ranlib '/usr/local/lib/mysql/libheap.a'
Making install in innobase
test -z "/usr/local/lib/mysql/plugin" || ../.././install-sh -c -d "/usr/local/lib/mysql/plugin"

Though there is nothing to install in the above output, install-sh appears to
still create the directory.
>How-To-Repeat:
bender#	cd /usr/ports/databases/mysql51-server
bender#	make install clean BUILD_STATIC=YES
bender#	make deinstall
bender#	find /usr/local/lib/mysql/plugin
/usr/local/lib/mysql/plugin
bender#	
>Fix:
Patch supplied.

--- databases-mysql51-server-pkg-plist.diff begins here ---
--- ports/databases/mysql51-server/pkg-plist.orig	2009-10-27 17:38:32.000000000 +1030
+++ ports/databases/mysql51-server/pkg-plist	2010-11-09 22:54:10.000000000 +1030
@@ -169,7 +169,7 @@
 %%NDB%%@dirrm include/mysql/storage/ndb
 %%NDB%%@dirrm include/mysql/storage
 @dirrmtry include/mysql
-%%PLUGINS%%@dirrm lib/mysql/plugin
+@dirrm lib/mysql/plugin
 @dirrmtry lib/mysql
 @dirrm %%DATADIR%%/charsets
 @dirrm %%DATADIR%%/czech
--- databases-mysql51-server-pkg-plist.diff ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Nov 9 13:10:17 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/152076: commit references a PR
Date: Tue, 23 Nov 2010 08:29:39 +0000 (UTC)

 ale         2010-11-23 08:29:34 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/mysql51-server Makefile distinfo pkg-plist 
   Log:
   Update to 5.1.53 release.
   Fix plist when BUILD_STATIC is set. [1]
   
   PR:             ports/152076 [1]
   Submitted by:   Jarrod Sayers <jarrod@downtools.com.au>
   
   Revision  Changes    Path
   1.271     +1 -1      ports/databases/mysql51-server/Makefile
   1.130     +2 -2      ports/databases/mysql51-server/distinfo
   1.88      +1 -1      ports/databases/mysql51-server/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: ale 
State-Changed-When: Tue Nov 23 08:30:27 UTC 2010 
State-Changed-Why:  
Fixed, thanks! 

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