From nobody@FreeBSD.org  Mon Aug  9 13:32:29 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6FEEF106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  9 Aug 2010 13:32:29 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 5EFD48FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  9 Aug 2010 13:32:29 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o79DWTOa088698
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 9 Aug 2010 13:32:29 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o79DWTLn088697;
	Mon, 9 Aug 2010 13:32:29 GMT
	(envelope-from nobody)
Message-Id: <201008091332.o79DWTLn088697@www.freebsd.org>
Date: Mon, 9 Aug 2010 13:32:29 GMT
From: Max Brazhnikov <makc@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: textproc/stardict3: disable advertisement plugins, minor clean-up
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: d9364104@mail.nchu.edu.tw

>Number:         149468
>Category:       ports
>Synopsis:       textproc/stardict3: disable advertisement plugins, minor clean-up
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    makc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 09 13:40:03 UTC 2010
>Closed-Date:    Mon Aug 23 18:34:58 UTC 2010
>Last-Modified:  Mon Aug 23 18:40:10 UTC 2010
>Originator:     Max Brazhnikov
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
>Environment:
FreeBSD luna.dio.ru 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #7: Wed Jul 14 01:05:50 MSD 2010     root@luna.dio.ru:/usr/obj/usr/freebsd/8/src/sys/LUNA  amd64
>Description:
Disable advertisement and updateinfo plugins (removes advertisement at the bottom of stardict window).
Respect PREFIX.
Create empty directories when installing from package.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/stardict3/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- Makefile	31 May 2010 02:01:19 -0000	1.41
+++ Makefile	9 Aug 2010 11:19:17 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	stardict
 PORTVERSION=	3.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 DIST_SUBDIR=	stardict
@@ -23,7 +23,9 @@
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-festival \
 		--disable-gucharmap \
-		--disable-espeak
+		--disable-espeak \
+		--disable-advertisement \
+		--disable-updateinfo
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix
@@ -52,6 +54,10 @@
 EXTRA_PATCHES+=	${FILESDIR}/src_conf.h
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \
+		${WRKSRC}/src/conf.cpp
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/textproc/stardict3/pkg-plist,v
retrieving revision 1.16
diff -u -r1.16 pkg-plist
--- pkg-plist	23 Sep 2008 04:07:39 -0000	1.16
+++ pkg-plist	9 Aug 2010 11:17:21 -0000
@@ -55,13 +55,6 @@
 share/stardict/pixmaps/splash.png
 share/stardict/sounds/menushow.wav
 share/stardict/sounds/buttonactive.wav
-share/stardict/data/advertisement/advertisement.txt
-share/stardict/data/advertisement/huzheng.png
-share/stardict/data/advertisement/linux_logo.jpg
-share/stardict/data/advertisement/redhat_linux_logo.gif
-share/stardict/data/advertisement/redhat_logo.jpg
-share/stardict/data/advertisement/wenjing.jpg
-share/stardict/data/advertisement/wenjing2.jpg
 share/locale/ar/LC_MESSAGES/stardict.mo
 share/locale/cs/LC_MESSAGES/stardict.mo
 share/locale/de/LC_MESSAGES/stardict.mo
@@ -86,12 +79,8 @@
 share/locale/zh_TW/LC_MESSAGES/stardict.mo
 lib/stardict/plugins/stardict_dictdotcn.so
 lib/stardict/plugins/stardict_dictdotcn.la
-lib/stardict/plugins/advertisement.so
-lib/stardict/plugins/advertisement.la
 lib/stardict/plugins/stardict_man.so
 lib/stardict/plugins/stardict_man.la
-lib/stardict/plugins/stardict_update_info.so
-lib/stardict/plugins/stardict_update_info.la
 lib/stardict/plugins/stardict_html_parsedata.so
 lib/stardict/plugins/stardict_html_parsedata.la
 lib/stardict/plugins/stardict_xdxf_parsedata.so
@@ -157,8 +146,6 @@
 @dirrm share/stardict/sounds
 @dirrm share/stardict/pixmaps
 @dirrm share/stardict/treedict
-@dirrm share/stardict/data/advertisement
-@dirrmtry share/stardict/data
 @dirrmtry share/stardict/dic
 @dirrmtry share/stardict
 %%GNOME%%@dirrm share/omf/stardict
@@ -178,3 +165,5 @@
 %%GNOME%%@dirrm share/gnome/help/stardict/nl
 %%GNOME%%@dirrm share/gnome/help/stardict
 @dirrmtry share/applications
+@exec mkdir -p %D/share/stardict/treedict
+@exec mkdir -p %D/share/stardict/dic


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->makc 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Aug 9 13:40:16 UTC 2010 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149468 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Aug 9 13:40:20 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: d9364104@mail.nchu.edu.tw
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/149468: textproc/stardict3: disable advertisement plugins, minor clean-up
Date: Mon, 9 Aug 2010 13:40:18 UT

 Maintainer of textproc/stardict3,
 
 Please note that PR ports/149468 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/149468
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->open 
State-Changed-By: makc 
State-Changed-When: Mon Aug 23 18:33:32 UTC 2010 
State-Changed-Why:  
maintainer timeout. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149468 
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Mon Aug 23 18:34:57 UTC 2010 
State-Changed-Why:  
Committed. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/149468: commit references a PR
Date: Mon, 23 Aug 2010 18:32:49 +0000 (UTC)

 makc        2010-08-23 18:32:40 UTC
 
   FreeBSD ports repository
 
   Modified files:
     textproc/stardict3   Makefile pkg-plist 
   Log:
   Disable advertisement and updateinfo plugins.
   Respect PREFIX.
   Create empty directories when installing from package.
   
   PR:             ports/149468
   Approved by:    maintainer timeout (two weeks)
   
   Revision  Changes    Path
   1.42      +8 -2      ports/textproc/stardict3/Makefile
   1.17      +2 -13     ports/textproc/stardict3/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"
 
>Unformatted:
