diff options
| -rw-r--r-- | devel/glade2/Makefile | 17 | ||||
| -rw-r--r-- | math/gnumeric/Makefile | 14 | ||||
| -rw-r--r-- | math/gnumeric/pkg-plist | 18 |
3 files changed, 36 insertions, 13 deletions
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile index 94f0ae3a0475..7d10859ca2fc 100644 --- a/devel/glade2/Makefile +++ b/devel/glade2/Makefile @@ -8,6 +8,7 @@ PORTNAME= glade PORTVERSION= 2.12.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -20,13 +21,23 @@ COMMENT= A user interface builder for GTK+/GNOME RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/modules/libgail-gnome.so:${PORTSDIR}/x11-toolkits/libgail-gnome USE_BZIP2= yes +USE_GETTEXT= yes USE_X_PREFIX= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix intlhack gnomehack libgnomedb libgnomeui +USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui +WANT_GNOME= yes USE_GMAKE= yes -CONFIGURE_ARGS= --enable-gnome-db CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${HAVE_GNOME:Mlibgnomedb}!="" +USE_GNOME+= libgnomedb +CONFIGURE_ARGS+= --enable-gnome-db +.else +CONFIGURE_ARGS+= --disable-gnome-db +.endif + +.include <bsd.port.post.mk> diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index c3bb99d4fc8b..a84489b270e7 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnumeric PORTVERSION= 1.6.3 +PORTREVISION= 1 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -20,11 +21,13 @@ LIB_DEPENDS= goffice-1.2:${PORTSDIR}/devel/goffice \ psiconv.10:${PORTSDIR}/converters/psiconv USE_BZIP2= yes +USE_GETTEXT= yes USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack gnomehier libgnomeprintui \ - libgsf_gnome pygtk2 desktopfileutils libgnomedb + libgsf_gnome pygtk2 desktopfileutils +WANT_GNOME= yes USE_PYTHON= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes @@ -49,6 +52,15 @@ PLIST_SUB+= PERL="@comment " PLIST_SUB+= PERL="" .endif +.if ${HAVE_GNOME:Mlibgnomedb}!="" +USE_GNOME+= libgnomedb +CONFIGURE_ARGS+= --with-gda +PLIST_SUB+= GNOMEDB="" +.else +CONFIGURE_ARGS+= --without-gda +PLIST_SUB+= GNOMEDB="@comment " +.endif + post-patch: @${RM} -f ${WRKSRC}/GNOME_Gnumeric.server.in diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist index 9e4da73142a6..20e15f4f9692 100644 --- a/math/gnumeric/pkg-plist +++ b/math/gnumeric/pkg-plist @@ -58,13 +58,13 @@ lib/gnumeric/%%VERSION%%/plugins/fn-stat/plugin.xml lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.la lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.so lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.xml -lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.la -lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so -lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml -lib/gnumeric/%%VERSION%%/plugins/gnome-db/gnomedb.la -lib/gnumeric/%%VERSION%%/plugins/gnome-db/gnomedb.so -lib/gnumeric/%%VERSION%%/plugins/gnome-db/plugin.xml -lib/gnumeric/%%VERSION%%/plugins/gnome-db/ui.xml +%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.la +%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so +%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml +%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gnome-db/gnomedb.la +%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gnome-db/gnomedb.so +%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gnome-db/plugin.xml +%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gnome-db/ui.xml lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/glossary-po-header lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.py lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.pyc @@ -784,8 +784,8 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo @dirrm lib/gnumeric/%%VERSION%%/plugins/lotus @dirrm lib/gnumeric/%%VERSION%%/plugins/html @dirrm lib/gnumeric/%%VERSION%%/plugins/gnome-glossary -@dirrm lib/gnumeric/%%VERSION%%/plugins/gnome-db -@dirrm lib/gnumeric/%%VERSION%%/plugins/gdaif +%%GNOMEDB%%@dirrm lib/gnumeric/%%VERSION%%/plugins/gnome-db +%%GNOMEDB%%@dirrm lib/gnumeric/%%VERSION%%/plugins/gdaif @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-string @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-stat @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-random |