Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Jul 2006 02:25:28 GMT
From:      Yuri Pankov <yuri.pankov@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/100053: [patch] textproc/stardict2
Message-ID:  <200607110225.k6B2PS64081372@www.freebsd.org>
Resent-Message-ID: <200607110230.k6B2UGZ4020280@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         100053
>Category:       ports
>Synopsis:       [patch] textproc/stardict2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 11 02:30:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Yuri Pankov
>Release:        7.0-CURRENT/amd64
>Organization:
>Environment:
FreeBSD klamath.irbis.net.ru 7.0-CURRENT FreeBSD 7.0-CURRENT #2: Sun Jul  9 23:49:57 MSD 2006     root@klamath.irbis.net.ru:/usr/obj/usr/src/sys/KLAMATH  amd64
>Description:
- Make dependency on GNOME libs OPTION'al
>How-To-Repeat:

>Fix:
diff -ruN stardict2.orig/Makefile stardict2/Makefile
--- stardict2.orig/Makefile     Tue Jul 11 05:41:21 2006
+++ stardict2/Makefile  Tue Jul 11 06:00:22 2006
@@ -22,11 +22,22 @@
 USE_GCC=       3.4
 USE_X_PREFIX=  yes
 USE_BZIP2=     yes
-USE_GNOME=     gnomehack gnomeprefix libgnomeui
+USE_GNOME=     gnomehack gnomeprefix
 USE_GETTEXT=   yes
 
+OPTIONS=        GNOME "GNOME support" On
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GNOME)
+USE_GNOME+=    libgnomeui
 GCONF_SCHEMAS= stardict.schemas
 INSTALLS_OMF=  yes
+PLIST_SUB=     GNOME:=""
+.else
+CONFIGURE_ARGS+=       --disable-gnome-support --disable-schemas-install
+PLIST_SUB=     GNOME:="@comment not installed: "
+.endif
 
 MAN1=          stardict.1
 
@@ -39,4 +50,4 @@
 post-install:
        @${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN stardict2.orig/pkg-plist stardict2/pkg-plist
--- stardict2.orig/pkg-plist    Tue Jul 11 05:41:21 2006
+++ stardict2/pkg-plist Tue Jul 11 06:11:27 2006
@@ -1,49 +1,49 @@
 bin/stardict
-libdata/bonobo/servers/GNOME_Stardict.server
+%%GNOME:%%libdata/bonobo/servers/GNOME_Stardict.server
 share/gnome/applications/stardict.desktop
-share/gnome/help/stardict/C/figures/stardict_float_window.png
-share/gnome/help/stardict/C/figures/stardict_main_window.png
-share/gnome/help/stardict/C/figures/stardict_notification_area.png
-share/gnome/help/stardict/C/legal.xml
-share/gnome/help/stardict/C/stardict.xml
-share/gnome/help/stardict/mk/figures/stardict_float_window.png
-share/gnome/help/stardict/mk/figures/stardict_main_window.png
-share/gnome/help/stardict/mk/figures/stardict_notification_area.png
-share/gnome/help/stardict/mk/legal.xml
-share/gnome/help/stardict/mk/stardict.xml
-share/gnome/help/stardict/nl/figures/stardict_float_window.png
-share/gnome/help/stardict/nl/figures/stardict_main_window.png
-share/gnome/help/stardict/nl/figures/stardict_notification_area.png
-share/gnome/help/stardict/nl/legal.xml
-share/gnome/help/stardict/nl/stardict.xml
-share/gnome/help/stardict/ru/figures/stardict_float_window.png
-share/gnome/help/stardict/ru/figures/stardict_main_window.png
-share/gnome/help/stardict/ru/figures/stardict_notification_area.png
-share/gnome/help/stardict/ru/legal.xml
-share/gnome/help/stardict/ru/stardict.xml
-share/gnome/help/stardict/uk/figures/stardict_float_window.png
-share/gnome/help/stardict/uk/figures/stardict_main_window.png
-share/gnome/help/stardict/uk/figures/stardict_notification_area.png
-share/gnome/help/stardict/uk/legal.xml
-share/gnome/help/stardict/uk/stardict.xml
-share/gnome/help/stardict/zh_CN/figures/stardict_float_window.png
-share/gnome/help/stardict/zh_CN/figures/stardict_main_window.png
-share/gnome/help/stardict/zh_CN/figures/stardict_notification_area.png
-share/gnome/help/stardict/zh_CN/legal.xml
-share/gnome/help/stardict/zh_CN/stardict.xml
-share/gnome/help/stardict/zh_TW/figures/stardict_float_window.png
-share/gnome/help/stardict/zh_TW/figures/stardict_main_window.png
-share/gnome/help/stardict/zh_TW/figures/stardict_notification_area.png
-share/gnome/help/stardict/zh_TW/legal.xml
-share/gnome/help/stardict/zh_TW/stardict.xml
-share/gnome/idl/GNOME_Stardict.idl
-share/gnome/omf/stardict/stardict-C.omf
-share/gnome/omf/stardict/stardict-mk.omf
-share/gnome/omf/stardict/stardict-nl.omf
-share/gnome/omf/stardict/stardict-ru.omf
-share/gnome/omf/stardict/stardict-uk.omf
-share/gnome/omf/stardict/stardict-zh_CN.omf
-share/gnome/omf/stardict/stardict-zh_TW.omf
+%%GNOME:%%share/gnome/help/stardict/C/figures/stardict_float_window.png
+%%GNOME:%%share/gnome/help/stardict/C/figures/stardict_main_window.png
+%%GNOME:%%share/gnome/help/stardict/C/figures/stardict_notification_area.png
+%%GNOME:%%share/gnome/help/stardict/C/legal.xml
+%%GNOME:%%share/gnome/help/stardict/C/stardict.xml
+%%GNOME:%%share/gnome/help/stardict/mk/figures/stardict_float_window.png
+%%GNOME:%%share/gnome/help/stardict/mk/figures/stardict_main_window.png
+%%GNOME:%%share/gnome/help/stardict/mk/figures/stardict_notification_area.png
+%%GNOME:%%share/gnome/help/stardict/mk/legal.xml
+%%GNOME:%%share/gnome/help/stardict/mk/stardict.xml
+%%GNOME:%%share/gnome/help/stardict/nl/figures/stardict_float_window.png
+%%GNOME:%%share/gnome/help/stardict/nl/figures/stardict_main_window.png
+%%GNOME:%%share/gnome/help/stardict/nl/figures/stardict_notification_area.png
+%%GNOME:%%share/gnome/help/stardict/nl/legal.xml
+%%GNOME:%%share/gnome/help/stardict/nl/stardict.xml
+%%GNOME:%%share/gnome/help/stardict/ru/figures/stardict_float_window.png
+%%GNOME:%%share/gnome/help/stardict/ru/figures/stardict_main_window.png
+%%GNOME:%%share/gnome/help/stardict/ru/figures/stardict_notification_area.png
+%%GNOME:%%share/gnome/help/stardict/ru/legal.xml
+%%GNOME:%%share/gnome/help/stardict/ru/stardict.xml
+%%GNOME:%%share/gnome/help/stardict/uk/figures/stardict_float_window.png
+%%GNOME:%%share/gnome/help/stardict/uk/figures/stardict_main_window.png
+%%GNOME:%%share/gnome/help/stardict/uk/figures/stardict_notification_area.png
+%%GNOME:%%share/gnome/help/stardict/uk/legal.xml
+%%GNOME:%%share/gnome/help/stardict/uk/stardict.xml
+%%GNOME:%%share/gnome/help/stardict/zh_CN/figures/stardict_float_window.png
+%%GNOME:%%share/gnome/help/stardict/zh_CN/figures/stardict_main_window.png
+%%GNOME:%%share/gnome/help/stardict/zh_CN/figures/stardict_notification_area.png
+%%GNOME:%%share/gnome/help/stardict/zh_CN/legal.xml
+%%GNOME:%%share/gnome/help/stardict/zh_CN/stardict.xml
+%%GNOME:%%share/gnome/help/stardict/zh_TW/figures/stardict_float_window.png
+%%GNOME:%%share/gnome/help/stardict/zh_TW/figures/stardict_main_window.png
+%%GNOME:%%share/gnome/help/stardict/zh_TW/figures/stardict_notification_area.png
+%%GNOME:%%share/gnome/help/stardict/zh_TW/legal.xml
+%%GNOME:%%share/gnome/help/stardict/zh_TW/stardict.xml
+%%GNOME:%%share/gnome/idl/GNOME_Stardict.idl
+%%GNOME:%%share/gnome/omf/stardict/stardict-C.omf
+%%GNOME:%%share/gnome/omf/stardict/stardict-mk.omf
+%%GNOME:%%share/gnome/omf/stardict/stardict-nl.omf
+%%GNOME:%%share/gnome/omf/stardict/stardict-ru.omf
+%%GNOME:%%share/gnome/omf/stardict/stardict-uk.omf
+%%GNOME:%%share/gnome/omf/stardict/stardict-zh_CN.omf
+%%GNOME:%%share/gnome/omf/stardict/stardict-zh_TW.omf
 share/gnome/pixmaps/stardict.png
 share/gnome/stardict/pixmaps/docklet_normal.png
 share/gnome/stardict/pixmaps/docklet_scan.png
@@ -76,19 +76,19 @@
 @dirrm share/gnome/stardict/sounds
 @dirrm share/gnome/stardict/pixmaps
 @dirrmtry share/gnome/stardict
-@dirrm share/gnome/omf/stardict
-@dirrm share/gnome/help/stardict/zh_TW/figures
-@dirrm share/gnome/help/stardict/zh_TW
-@dirrm share/gnome/help/stardict/zh_CN/figures
-@dirrm share/gnome/help/stardict/zh_CN
-@dirrm share/gnome/help/stardict/uk/figures
-@dirrm share/gnome/help/stardict/uk
-@dirrm share/gnome/help/stardict/ru/figures
-@dirrm share/gnome/help/stardict/ru
-@dirrm share/gnome/help/stardict/nl/figures
-@dirrm share/gnome/help/stardict/nl
-@dirrm share/gnome/help/stardict/mk/figures
-@dirrm share/gnome/help/stardict/mk
-@dirrm share/gnome/help/stardict/C/figures
-@dirrm share/gnome/help/stardict/C
-@dirrm share/gnome/help/stardict
+%%GNOME:%%@dirrm share/gnome/omf/stardict
+%%GNOME:%%@dirrm share/gnome/help/stardict/zh_TW/figures
+%%GNOME:%%@dirrm share/gnome/help/stardict/zh_TW
+%%GNOME:%%@dirrm share/gnome/help/stardict/zh_CN/figures
+%%GNOME:%%@dirrm share/gnome/help/stardict/zh_CN
+%%GNOME:%%@dirrm share/gnome/help/stardict/uk/figures
+%%GNOME:%%@dirrm share/gnome/help/stardict/uk
+%%GNOME:%%@dirrm share/gnome/help/stardict/ru/figures
+%%GNOME:%%@dirrm share/gnome/help/stardict/ru
+%%GNOME:%%@dirrm share/gnome/help/stardict/nl/figures
+%%GNOME:%%@dirrm share/gnome/help/stardict/nl
+%%GNOME:%%@dirrm share/gnome/help/stardict/mk/figures
+%%GNOME:%%@dirrm share/gnome/help/stardict/mk
+%%GNOME:%%@dirrm share/gnome/help/stardict/C/figures
+%%GNOME:%%@dirrm share/gnome/help/stardict/C
+%%GNOME:%%@dirrm share/gnome/help/stardict

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607110225.k6B2PS64081372>