From leeym@utopia.leeym.com  Mon Sep 20 18:19:18 2004
Return-Path: <leeym@utopia.leeym.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6477A16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 20 Sep 2004 18:19:18 +0000 (GMT)
Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ABB1743D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 20 Sep 2004 18:19:17 +0000 (GMT)
	(envelope-from leeym@utopia.leeym.com)
Received: from localhost (localhost [127.0.0.1])
	by utopia.leeym.com (Postfix) with ESMTP id 844E63EADD3;
	Tue, 21 Sep 2004 02:19:16 +0800 (CST)
Received: from utopia.leeym.com ([127.0.0.1])
 by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 84751-03; Tue, 21 Sep 2004 02:19:12 +0800 (CST)
Received: by utopia.leeym.com (Postfix, from userid 1000)
	id 175CD3EADD1; Tue, 21 Sep 2004 02:19:12 +0800 (CST)
Message-Id: <20040920181912.175CD3EADD1@utopia.leeym.com>
Date: Tue, 21 Sep 2004 02:19:12 +0800 (CST)
From: Yen-Ming Lee <leeym@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: autrijus@autrijus.org
Subject: [PATCH] chinese/zh-metalist: fix PLIST and unbreak
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         71947
>Category:       ports
>Synopsis:       [PATCH] chinese/zh-metalist: fix PLIST and unbreak
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    leeym
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 20 18:20:07 GMT 2004
>Closed-Date:    Tue Sep 21 20:00:05 GMT 2004
>Last-Modified:  Tue Sep 21 20:00:05 GMT 2004
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.3-BETA4 i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.3-BETA4 FreeBSD 5.3-BETA4 #7: Mon Sep 13 05:12:30 CST 2004
>Description:

- fix PLIST and unbreak
- add SIZE in distinfo
- correct CONFLICTS
- add USE_REINPLACE and make this port PREFIX clean

Port maintainer (autrijus@autrijus.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:

http://pointyhat.freebsd.org/errorlogs/i386-5-full/zh-metalist-2.2.6_11069.log

>Fix:

--- zh-metalist-2.2.6_11069.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/chinese/metalist/Makefile,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile
--- Makefile	25 Aug 2004 08:56:43 -0000	1.14
+++ Makefile	20 Sep 2004 18:17:44 -0000
@@ -47,8 +47,9 @@
 
 DOCS=		README README.metalist INSTALL
 NO_BUILD=	yes
+USE_REINPLACE=	yes
 
-CONFLICTS=	slash
+CONFLICTS=	slash-[0-9]*
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		FZ.3 Slash.3 Slash::Apache.3 Slash::Apache::Banlist.3 \
@@ -82,9 +83,12 @@
 .if defined(WITH_APACHE2)
 	@(cd ${WRKDIR} && ${PATCH} < ${WRKSRC}/slash-2.2.6-modperl2.diff.txt 2>/dev/null)
 .endif
+	@${REINPLACE_CMD} -E -e 's,/usr/local,${PREFIX},g' \
+		-e 's,(\$\(PERL\) Makefile.PL),\1 PREFIX=\$$\(PREFIX\),g' \
+		${WRKSRC}/Makefile
 
 post-install:
-	@${FIND} ${PREFIX}/slash -name "*.orig" -delete
+	@${FIND} ${PREFIX}/slash -name "*.orig" -or -name "*.bak" -delete
 .if defined(WITH_APACHE2)
 	@${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g -e s!%%APACHE%%!apache2!g ${PKGMESSAGE}
 .else
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/chinese/metalist/distinfo,v
retrieving revision 1.4
diff -u -u -r1.4 distinfo
--- distinfo	25 Aug 2004 08:56:43 -0000	1.4
+++ distinfo	20 Sep 2004 18:17:44 -0000
@@ -1,2 +1,4 @@
 MD5 (slash-2.2.6.tar.gz) = a9886e1e08e47e0db4f3ba3e750102ff
+SIZE (slash-2.2.6.tar.gz) = 584128
 MD5 (metalist-11069.tar.gz) = 785cc8cfe1b84873aff5e42477169db2
+SIZE (metalist-11069.tar.gz) = 720787
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/chinese/metalist/pkg-plist,v
retrieving revision 1.4
diff -u -u -r1.4 pkg-plist
--- pkg-plist	6 Mar 2004 06:04:04 -0000	1.4
+++ pkg-plist	20 Sep 2004 18:17:45 -0000
@@ -1,3 +1,54 @@
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache/Apache.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache/Apache.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache/User/User.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache/User/User.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache/User/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Journal/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Search/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Messages/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/XML/FZ.pm/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/OurNet/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/wiki.pl/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Apache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Display.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Install.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Test.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/XML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Apache/Banlist.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Apache/Log.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Apache/User.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Custom/Bulkmail.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/MySQL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/Oracle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/PostgreSQL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/Utility.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/Static/MySQL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/Static/Oracle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/Static/PostgreSQL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Display/Plugin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Display/Provider.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility/Access.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility/Anchor.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility/Data.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility/Display.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility/Environment.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility/System.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/XML/RSS.pm
+%%SITE_PERL%%/Slash/Journal.pm
+%%SITE_PERL%%/Slash/Search.pm
+%%SITE_PERL%%/Slash/Messages.pm
+%%SITE_PERL%%/Slash/Messages/DB/MySQL.pm
+%%SITE_PERL%%/Slash/XML/FZ.pm
+%%SITE_PERL%%/Slash/trapped.pl
+%%SITE_PERL%%/Slash/ournet.pl
+%%SITE_PERL%%/Slash/OurNet.pm
+%%SITE_PERL%%/Slash/OurNet/Standalone.pm
+%%SITE_PERL%%/wiki.pl
 slash/themes/slashcode/templates/yourPendingSubs;submit;default
 slash/themes/slashcode/templates/vote;pollBooth;default
 slash/themes/slashcode/templates/users;menu;default
@@ -713,12 +764,22 @@
 slash/plugins/Search/Makefile.PL
 slash/plugins/Search/MANIFEST
 slash/plugins/Search/Changes
-slash/plugins/RSS2Story/sql/rss2story_schema.sql
-slash/plugins/RSS2Story/sql/rss2story_dump.sql
-slash/plugins/RSS2Story/tasks/rss2story.pl
-slash/plugins/RSS2Story/templates/category;rss2story;default
-slash/plugins/RSS2Story/templates/schedule;rss2story;default
-slash/plugins/RSS2Story/templates/source;rss2story;default
+slash/plugins/StylesSite/templates/common;styles-site;default
+slash/plugins/StylesSite/templates/default;styles-site;default
+slash/plugins/StylesSite/PLUGIN
+slash/plugins/StylesSite/TODO
+slash/plugins/StylesSite/styles-site.pl
+slash/plugins/RSS2Story/templates/main;rss2story;default
+slash/plugins/RSS2Story/templates/searchForm;rss2story;default
+slash/plugins/RSS2Story/templates/searchResult;rss2story;default
+slash/plugins/RSS2Story/INSTALL
+slash/plugins/RSS2Story/README
+slash/plugins/RSS2Story/RSS-import.pl
+slash/plugins/RSS2Story/install.pl
+slash/plugins/RSS2Story/mysql_dump
+slash/plugins/RSS2Story/mysql_schema
+slash/plugins/RSS2Story/IDEA
+slash/plugins/RSS2Story/topicrss.png
 slash/plugins/RSS2Story/RSS2Story.pm
 slash/plugins/RSS2Story/PLUGIN
 slash/plugins/RSS2Story/rss2story.pl
@@ -938,11 +999,11 @@
 @dirrm slash/plugins/Wiki/templates
 @dirrm slash/plugins/Wiki/sql
 @dirrm slash/plugins/Wiki
+@dirrm slash/plugins/StylesSite/templates
+@dirrm slash/plugins/StylesSite
 @dirrm slash/plugins/Search/templates
 @dirrm slash/plugins/Search
 @dirrm slash/plugins/RSS2Story/templates
-@dirrm slash/plugins/RSS2Story/tasks
-@dirrm slash/plugins/RSS2Story/sql
 @dirrm slash/plugins/RSS2Story
 @dirrm slash/plugins/OurNet/templates/music543
 @dirrm slash/plugins/OurNet/templates/elixus
--- zh-metalist-2.2.6_11069.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: leeym 
State-Changed-When: Mon Sep 20 18:24:01 GMT 2004 
State-Changed-Why:  
The maintainer is Cc-ed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71947 
Responsible-Changed-From-To: freebsd-ports-bugs->leeym 
Responsible-Changed-By: leeym 
Responsible-Changed-When: Mon Sep 20 18:24:04 GMT 2004 
Responsible-Changed-Why:  
I will take care of this PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71947 
State-Changed-From-To: feedback->closed 
State-Changed-By: leeym 
State-Changed-When: Tue Sep 21 20:00:02 GMT 2004 
State-Changed-Why:  
Committed, thanks. 

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