Update to version 2.30

PR: ports/172051 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Feature safe: yes
freebsd · Nov 10, 2012 · d0261c0 · d0261c0
1 parent bc573d2
commit d0261c0
Show file tree

Hide file tree

Showing 4 changed files with 370 additions and 218 deletions.
diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile
@@ -2,67 +2,94 @@
 # $FreeBSD$
 
 PORTNAME=	gwyddion
-PORTVERSION=	2.27
+PORTVERSION=	2.30
-PORTREVISION=	1
 CATEGORIES=	science graphics
 MASTER_SITES=	SF
 
-PATCH_SITES=	${MASTER_SITES}
-PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A gtk2 based SPM data visualization and analysis tool
+COMMENT=	Gtk2 based SPM data visualization and analysis tool
+
+LICENSE=	GPLv2 # (or later)
 
-LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
+		pcre:${PORTSDIR}/devel/pcre \
+		IlmImf:${PORTSDIR}/graphics/OpenEXR \
+		cairo:${PORTSDIR}/graphics/cairo \
+		IlmThread:${PORTSDIR}/graphics/ilmbase \
+		drm:${PORTSDIR}/graphics/libdrm \
 		png15:${PORTSDIR}/graphics/png \
-		fftw3:${PORTSDIR}/math/fftw3
+		fftw3:${PORTSDIR}/math/fftw3 \
+		freetype:${PORTSDIR}/print/freetype2 \
+		expat:${PORTSDIR}/textproc/expat2 \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
+		xcb:${PORTSDIR}/x11/libxcb
 
+OPTIONS_DEFINE=	PERL PYTHON RUBY UNIQUE
+OPTIONS_DEFAULT=PERL PYTHON UNIQUE
+UNIQUE_DESC=	Remote controle backend support
+
+USE_XZ=		yes
+USE_GNOME=	desktopfileutils gconf2 gnomehack gnomemimedata gtk20 libxml2
+USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
+		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
+USE_GL=		glu
+USE_GETTEXT=	yes
+USE_ICONV=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-silent-rules --disable-gtk-doc \
+		--disable-pygwy --without-gtksourceview \
+		--without-kde4-thumbnailer
+INSTALLS_ICONS=	yes
+USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
-		--disable-pygwy --without-kde4-thumbnailer
 
-MAKE_ARGS=	pkgconfigdatadir=${PREFIX}/libdata/pkgconfig
+GCONF_SCHEMAS=	gwyddion-thumbnailer.schemas
 
-USE_GNOME=	desktopfileutils gnomemimedata gtk20 libxml2
+MAN1=		gwyddion.1 gwyddion-thumbnailer.1
-USE_GL=		yes
+
-USE_GMAKE=	yes
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPERL}
 USE_PERL5=	yes
-USE_PYTHON=	yes
+MAN3+=		Gwyddion::dump.3pm
-USE_RUBY=	yes
+PLIST_SUB+=	PERL=""
-USE_LDCONFIG=	yes
+.else
-INSTALLS_ICONS=	yes
+CONFIGURE_ARGS+=--without-perl
+PLIST_SUB+=	PERL="@comment "
+.endif
 
-MAN1=		gwyddion.1 gwyddion-thumbnailer.1
+.if ${PORT_OPTIONS:MPYTHON}
-MAN3=		Gwyddion::dump.3pm
+USE_PYTHON=	yes
+PLIST_SUB+=	PYTHON=""
+.else
+CONFIGURE_ARGS+=--without-python
+PLIST_SUB+=	PYTHON="@comment "
+.endif
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MRUBY}
-CONFIGURE_ARGS+=--disable-nls
+USE_RUBY=	yes
-PLIST_SUB+=	NLS="@comment "
+PLIST_SUB+=	RUBY=""
 .else
-USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--without-ruby
-PLIST_SUB+=	NLS=""
+PLIST_SUB+=	RUBY="@comment "
 .endif
 
-.if !defined(WITHOUT_GCONF) || exists(${LOCALBASE}/bin/gconftool-2)
+.if ${PORT_OPTIONS:MUNIQUE}
-USE_GNOME+=	gconf2
+LIB_DEPENDS+=	unique-1.0:${PORTSDIR}/x11-toolkits/unique
-GCONF_SCHEMAS=	gwyddion-thumbnailer.schemas
+.else
+CONFIGURE_ARGS+=--without-unique
 .endif
 
-# Fix shared library versioning and inhibit installation of .la files manually.
-# Ports libtool + ltverhack fixes versions but it installs static versions of
-# modules, so one would have to hack it too.
-#
-# Inhibit installation of excessive API documentation.  Option
-# --disable-gtk-doc disables only building, not installation of documentation
-# present in the source tarball.
 post-patch:
-	${REINPLACE_CMD} -e \
+	@${REINPLACE_CMD} -e \
-		'/freebsd-elf)/,/;;/ s|major="\.$$current"|major=.`expr $$current - $$age`|; \
+		's|thumbnailer \\|thumbnailer| ; \
-		 /freebsd-elf)/,/;;/ s|versuffix="\.$$current"|versuffix="$$major"|; \
+		 s|devel-docs$$||' ${WRKSRC}/Makefile.in
-		 /# Install the pseudo-library/,/^$$/d' \
-		${WRKSRC}/ltmain.sh
-	@${REINPLACE_CMD} -e '/^SUBDIRS =/,/[^\]$$/d' ${WRKSRC}/devel-docs/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/science/gwyddion/distinfo b/science/gwyddion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gwyddion-2.27.tar.gz) = 46a28a4826385a7ccffd9d199461eaa7cbeb0bc95ad068051cbea43c2fa08ba6
+SHA256 (gwyddion-2.30.tar.xz) = 3778e56ec5f2d2333297c9aa2b850a1cb2b29b9e71421657223c44f30e05b140
-SIZE (gwyddion-2.27.tar.gz) = 4694295
+SIZE (gwyddion-2.30.tar.xz) = 2771208
diff --git a/science/gwyddion/files/patch-pixmap.c b/science/gwyddion/files/patch-pixmap.c