svn commit: r323249 - head/emulators/qemu-devel

[Juergen Lock]

Author: nox
Date: Thu Jul 18 17:54:56 2013
New Revision: 323249
URL: http://svnweb.freebsd.org/changeset/ports/323249

Log:
  - Add missing USES=pkgconfig.
  - Rename GTK knob to GTK2.
  
  Submitted by:	olgeni (via private email)

Modified:
  head/emulators/qemu-devel/Makefile
  head/emulators/qemu-devel/pkg-plist

Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile	Thu Jul 18 17:47:53 2013	(r323248)
+++ head/emulators/qemu-devel/Makefile	Thu Jul 18 17:54:56 2013	(r323249)
@@ -18,7 +18,7 @@ LIB_DEPENDS=	pixman-1:${PORTSDIR}/x11/pi
 
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
-USES=		gmake
+USES=		gmake pkgconfig
 USE_PERL5_BUILD=	yes
 USE_PYTHON_BUILD=	yes
 USE_GNOME+=	glib20
@@ -30,7 +30,7 @@ ONLY_FOR_ARCHS=	amd64 i386 powerpc # XXX
 CONFLICTS_INSTALL=	qemu-[0-9]*
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS_DEFINE=	SAMBA X11 GTK OPENGL GNUTLS SASL JPEG PNG CURL \
+OPTIONS_DEFINE=	SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \
 		CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS BSD_USER \
 		STATIC_LINK DOCS
 SAMBA_DESC=		samba dependency (for -smb)
@@ -46,7 +46,7 @@ GNS3_DESC=		gns3 patches (promiscuous mu
 X86_TARGETS_DESC=	Don't build non-x86 system targets
 BSD_USER_DESC=		Also build bsd-user targets (for testing)
 STATIC_LINK_DESC=	Statically link the executables
-OPTIONS_DEFAULT=X11 GTK OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP
+OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP
 
 .include <bsd.port.options.mk>
 
@@ -115,13 +115,13 @@ CONFIGURE_ARGS+=	--enable-sdl
 USE_SDL=	sdl
 .endif
 
-.if empty(PORT_OPTIONS:MGTK)
+.if empty(PORT_OPTIONS:MGTK2)
 CONFIGURE_ARGS+=	--disable-gtk
-PLIST_SUB+=	GTK="@comment "
+PLIST_SUB+=	GTK2="@comment "
 .else
 USE_GNOME+=	gtk20 vte
 USES+=		gettext
-PLIST_SUB+=	GTK=""
+PLIST_SUB+=	GTK2=""
 .endif
 
 .if empty(PORT_OPTIONS:MGNUTLS)
@@ -172,7 +172,7 @@ CONFIGURE_ARGS+=	--enable-pcap
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC_LINK}
-.if ${PORT_OPTIONS:MGTK} || ${PORT_OPTIONS:MX11}
+.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MX11}
 IGNORE=		X11 ui cannot be built static
 .endif
 CONFIGURE_ARGS+=	--static

Modified: head/emulators/qemu-devel/pkg-plist
==============================================================================
--- head/emulators/qemu-devel/pkg-plist	Thu Jul 18 17:47:53 2013	(r323248)
+++ head/emulators/qemu-devel/pkg-plist	Thu Jul 18 17:54:56 2013	(r323249)
@@ -120,12 +120,12 @@ etc/qemu/target-x86_64.conf.sample
 %%DATADIR%%/keymaps/sv
 %%DATADIR%%/keymaps/th
 %%DATADIR%%/keymaps/tr
-%%GTK%%share/locale/de_DE/LC_MESSAGES/qemu.mo
-%%GTK%%share/locale/fr_FR/LC_MESSAGES/qemu.mo
-%%GTK%%share/locale/it/LC_MESSAGES/qemu.mo
-%%GTK%%share/locale/tr/LC_MESSAGES/qemu.mo
+%%GTK2%%share/locale/de_DE/LC_MESSAGES/qemu.mo
+%%GTK2%%share/locale/fr_FR/LC_MESSAGES/qemu.mo
+%%GTK2%%share/locale/it/LC_MESSAGES/qemu.mo
+%%GTK2%%share/locale/tr/LC_MESSAGES/qemu.mo
 @dirrm %%DATADIR%%/keymaps
-%%GTK%%@dirrmtry share/locale/de_DE/LC_MESSAGES
-%%GTK%%@dirrmtry share/locale/de_DE
+%%GTK2%%@dirrmtry share/locale/de_DE/LC_MESSAGES
+%%GTK2%%@dirrmtry share/locale/de_DE
 @dirrmtry %%DATADIR%%
 @dirrmtry %%DOCSDIR%%