- Fix BKTR support

- Add option for Video4Linux support

PR:		186743
Submitted by:	Ports Fury

2 files changed, 115 insertions, 101 deletions

diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile
index f76534e64c08..7ac5385d278d 100644
--- a/audio/gqradio/Makefile
+++ b/audio/gqradio/Makefile
@@ -3,28 +3,42 @@
 
 PORTNAME=	gqradio
 PORTVERSION=	1.9.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	audio
 MASTER_SITES=	SF/gqmpeg/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK2 based FM tuner
 
-GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20 gnomehack gnomeprefix
-NO_STAGE=	yes
+LICENSE=	GPLv2
 
-ONLY_FOR_ARCHS=	alpha i386 ia64
+USES=		gettext pathfix pkgconfig
+USE_GNOME=	gtk20
+GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+OPTIONS_DEFINE=		DOCS V4L
+
+V4L_BUILD_DEPENDS=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
+V4L_CONFIGURE_ENV_OFF=	ac_cv_header_linux_videodev_h=no
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|\(doc/gqradio\)-\$$VERSION|\1|' \
+	@${REINPLACE_CMD} -e \
+		's|header_machine_ioctl_bt848|header_dev_bktr_ioctl_bt848| ; \
+		 s|machine/ioctl_bt848|dev/bktr/ioctl_bt848| ; \
+		 s|\(doc/gqradio\)-\$$VERSION|\1|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|^\(readmedir = \).*|\1$$(prefix)/share/doc/gqradio|; \
 		 s|COPYING||' \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|^\(Icon=\).*|\1${PREFIX}/share/pixmaps/gqradio.png|' \
+		${WRKSRC}/gqradio.desktop
+	@${REINPLACE_CMD} -e \
+		's|machine/ioctl_bt848|dev/bktr/ioctl_bt848|' \
+		${WRKSRC}/src/io_radio.c
 
 .include <bsd.port.mk>
diff --git a/audio/gqradio/pkg-plist b/audio/gqradio/pkg-plist
index 517b84cdc1dc..52b818e82660 100644
--- a/audio/gqradio/pkg-plist
+++ b/audio/gqradio/pkg-plist
@@ -1,98 +1,98 @@
 bin/gqradio
-share/doc/gqradio/ChangeLog
-share/doc/gqradio/README
-share/doc/gqradio/SKIN-SPECS
-share/doc/gqradio/TODO
 share/applications/gqradio.desktop
-share/gqradio/skins/SKIN-SPECS
-share/gqradio/skins/default/btn-grey-34x12-advanced1.png
-share/gqradio/skins/default/btn-grey-34x12-advanced2.png
-share/gqradio/skins/default/btn-grey-34x12-clear.png
-share/gqradio/skins/default/btn-grey-34x12-config.png
-share/gqradio/skins/default/btn-grey-34x12-del.png
-share/gqradio/skins/default/btn-grey-34x12-scan.png
-share/gqradio/skins/default/btn-grey-34x12-set.png
-share/gqradio/skins/default/btn-grey-34x20-mode.png
-share/gqradio/skins/default/btn-grey-34x20-mute.png
-share/gqradio/skins/default/btn-grey-42x20-down.png
-share/gqradio/skins/default/btn-grey-42x20-up.png
-share/gqradio/skins/default/btn-grey-expand.png
-share/gqradio/skins/default/btn-grey-shrink.png
-share/gqradio/skins/default/btn-grey-sizer.png
-share/gqradio/skins/default/btn-pda-16-minus.png
-share/gqradio/skins/default/btn-pda-16-plus.png
-share/gqradio/skins/default/btn-pda-exit.png
-share/gqradio/skins/default/btn-pda-iconify.png
-share/gqradio/skins/default/btn-pos-14-down.png
-share/gqradio/skins/default/btn-pos-14-up.png
-share/gqradio/skins/default/digit-digital-15-aa.png
-share/gqradio/skins/default/digit-digital-24-aa.png
-share/gqradio/skins/default/item-cycle-6.png
-share/gqradio/skins/default/item-radio-mute-large.png
-share/gqradio/skins/default/item-radio-scanning-11.png
-share/gqradio/skins/default/item-radio-stereo.png
-share/gqradio/skins/default/item-radio-strength-9.png
-share/gqradio/skins/default/item-radio-tunemode.png
-share/gqradio/skins/default/item-radio-volume-19.png
-share/gqradio/skins/default/item-set.png
-share/gqradio/skins/default/list-pos-back.png
-share/gqradio/skins/default/list-pos-row-menu.png
-share/gqradio/skins/default/list-pos-row.png
-share/gqradio/skins/default/main-pos-blank.png
-share/gqradio/skins/default/main-pos-extra.png
-share/gqradio/skins/default/menu_back_green.png
-share/gqradio/skins/default/menu_list_icons.png
-share/gqradio/skins/default/pic-dot.png
-share/gqradio/skins/default/pic-mhz.png
-share/gqradio/skins/default/skindata
-share/gqradio/skins/default/skindata_advanced
-share/gqradio/skins/default/skindata_menu
-share/gqradio/skins/default/skindata_presets
-share/gqradio/skins/default/skindata_presets_advanced
-share/gqradio/skins/default/skindata_submenu
-share/gqradio/skins/default/slider-pos-14h.png
-share/gqradio/skins/skyblue/back-blue.png
-share/gqradio/skins/skyblue/back-list-blue.png
-share/gqradio/skins/skyblue/back-menu-blue.png
-share/gqradio/skins/skyblue/btn-22-sizer2.png
-share/gqradio/skins/skyblue/btn-blue14-fade-close.png
-share/gqradio/skins/skyblue/btn-blue14-fade-down.png
-share/gqradio/skins/skyblue/btn-blue14-fade-iconify.png
-share/gqradio/skins/skyblue/btn-blue14-fade-up.png
-share/gqradio/skins/skyblue/btn-blue22-fade-clear.png
-share/gqradio/skins/skyblue/btn-blue22-fade-config.png
-share/gqradio/skins/skyblue/btn-blue22-fade-left.png
-share/gqradio/skins/skyblue/btn-blue22-fade-list.png
-share/gqradio/skins/skyblue/btn-blue22-fade-minus.png
-share/gqradio/skins/skyblue/btn-blue22-fade-mode3.png
-share/gqradio/skins/skyblue/btn-blue22-fade-mute.png
-share/gqradio/skins/skyblue/btn-blue22-fade-right.png
-share/gqradio/skins/skyblue/btn-blue22t-fade-add.png
-share/gqradio/skins/skyblue/btn-blue22t-fade-scan.png
-share/gqradio/skins/skyblue/digit-digital-15-aa.png
-share/gqradio/skins/skyblue/digit-digital-24-aa.png
-share/gqradio/skins/skyblue/item-cycle-6.png
-share/gqradio/skins/skyblue/item-radio-mute-large.png
-share/gqradio/skins/skyblue/item-radio-tunemode.png
-share/gqradio/skins/skyblue/item-set.png
-share/gqradio/skins/skyblue/item-signal4.png
-share/gqradio/skins/skyblue/item-volume12-shadow.png
-share/gqradio/skins/skyblue/list-back.png
-share/gqradio/skins/skyblue/list-menu-icons.png
-share/gqradio/skins/skyblue/list-menu-row20.png
-share/gqradio/skins/skyblue/list-row16.png
-share/gqradio/skins/skyblue/menu_list_icons.png
-share/gqradio/skins/skyblue/pic-dot.png
-share/gqradio/skins/skyblue/pic-mhz.png
-share/gqradio/skins/skyblue/skindata
-share/gqradio/skins/skyblue/skindata_menu
-share/gqradio/skins/skyblue/skindata_presets
-share/gqradio/skins/skyblue/skindata_submenu
-share/gqradio/skins/skyblue/slider-vert-24.png
-share/pixmaps/gqradio.png
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/SKIN-SPECS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%DATADIR%%/skins/SKIN-SPECS
+%%DATADIR%%/skins/default/btn-grey-34x12-advanced1.png
+%%DATADIR%%/skins/default/btn-grey-34x12-advanced2.png
+%%DATADIR%%/skins/default/btn-grey-34x12-clear.png
+%%DATADIR%%/skins/default/btn-grey-34x12-config.png
+%%DATADIR%%/skins/default/btn-grey-34x12-del.png
+%%DATADIR%%/skins/default/btn-grey-34x12-scan.png
+%%DATADIR%%/skins/default/btn-grey-34x12-set.png
+%%DATADIR%%/skins/default/btn-grey-34x20-mode.png
+%%DATADIR%%/skins/default/btn-grey-34x20-mute.png
+%%DATADIR%%/skins/default/btn-grey-42x20-down.png
+%%DATADIR%%/skins/default/btn-grey-42x20-up.png
+%%DATADIR%%/skins/default/btn-grey-expand.png
+%%DATADIR%%/skins/default/btn-grey-shrink.png
+%%DATADIR%%/skins/default/btn-grey-sizer.png
+%%DATADIR%%/skins/default/btn-pda-16-minus.png
+%%DATADIR%%/skins/default/btn-pda-16-plus.png
+%%DATADIR%%/skins/default/btn-pda-exit.png
+%%DATADIR%%/skins/default/btn-pda-iconify.png
+%%DATADIR%%/skins/default/btn-pos-14-down.png
+%%DATADIR%%/skins/default/btn-pos-14-up.png
+%%DATADIR%%/skins/default/digit-digital-15-aa.png
+%%DATADIR%%/skins/default/digit-digital-24-aa.png
+%%DATADIR%%/skins/default/item-cycle-6.png
+%%DATADIR%%/skins/default/item-radio-mute-large.png
+%%DATADIR%%/skins/default/item-radio-scanning-11.png
+%%DATADIR%%/skins/default/item-radio-stereo.png
+%%DATADIR%%/skins/default/item-radio-strength-9.png
+%%DATADIR%%/skins/default/item-radio-tunemode.png
+%%DATADIR%%/skins/default/item-radio-volume-19.png
+%%DATADIR%%/skins/default/item-set.png
+%%DATADIR%%/skins/default/list-pos-back.png
+%%DATADIR%%/skins/default/list-pos-row-menu.png
+%%DATADIR%%/skins/default/list-pos-row.png
+%%DATADIR%%/skins/default/main-pos-blank.png
+%%DATADIR%%/skins/default/main-pos-extra.png
+%%DATADIR%%/skins/default/menu_back_green.png
+%%DATADIR%%/skins/default/menu_list_icons.png
+%%DATADIR%%/skins/default/pic-dot.png
+%%DATADIR%%/skins/default/pic-mhz.png
+%%DATADIR%%/skins/default/skindata
+%%DATADIR%%/skins/default/skindata_advanced
+%%DATADIR%%/skins/default/skindata_menu
+%%DATADIR%%/skins/default/skindata_presets
+%%DATADIR%%/skins/default/skindata_presets_advanced
+%%DATADIR%%/skins/default/skindata_submenu
+%%DATADIR%%/skins/default/slider-pos-14h.png
+%%DATADIR%%/skins/skyblue/back-blue.png
+%%DATADIR%%/skins/skyblue/back-list-blue.png
+%%DATADIR%%/skins/skyblue/back-menu-blue.png
+%%DATADIR%%/skins/skyblue/btn-22-sizer2.png
+%%DATADIR%%/skins/skyblue/btn-blue14-fade-close.png
+%%DATADIR%%/skins/skyblue/btn-blue14-fade-down.png
+%%DATADIR%%/skins/skyblue/btn-blue14-fade-iconify.png
+%%DATADIR%%/skins/skyblue/btn-blue14-fade-up.png
+%%DATADIR%%/skins/skyblue/btn-blue22-fade-clear.png
+%%DATADIR%%/skins/skyblue/btn-blue22-fade-config.png
+%%DATADIR%%/skins/skyblue/btn-blue22-fade-left.png
+%%DATADIR%%/skins/skyblue/btn-blue22-fade-list.png
+%%DATADIR%%/skins/skyblue/btn-blue22-fade-minus.png
+%%DATADIR%%/skins/skyblue/btn-blue22-fade-mode3.png
+%%DATADIR%%/skins/skyblue/btn-blue22-fade-mute.png
+%%DATADIR%%/skins/skyblue/btn-blue22-fade-right.png
+%%DATADIR%%/skins/skyblue/btn-blue22t-fade-add.png
+%%DATADIR%%/skins/skyblue/btn-blue22t-fade-scan.png
+%%DATADIR%%/skins/skyblue/digit-digital-15-aa.png
+%%DATADIR%%/skins/skyblue/digit-digital-24-aa.png
+%%DATADIR%%/skins/skyblue/item-cycle-6.png
+%%DATADIR%%/skins/skyblue/item-radio-mute-large.png
+%%DATADIR%%/skins/skyblue/item-radio-tunemode.png
+%%DATADIR%%/skins/skyblue/item-set.png
+%%DATADIR%%/skins/skyblue/item-signal4.png
+%%DATADIR%%/skins/skyblue/item-volume12-shadow.png
+%%DATADIR%%/skins/skyblue/list-back.png
+%%DATADIR%%/skins/skyblue/list-menu-icons.png
+%%DATADIR%%/skins/skyblue/list-menu-row20.png
+%%DATADIR%%/skins/skyblue/list-row16.png
+%%DATADIR%%/skins/skyblue/menu_list_icons.png
+%%DATADIR%%/skins/skyblue/pic-dot.png
+%%DATADIR%%/skins/skyblue/pic-mhz.png
+%%DATADIR%%/skins/skyblue/skindata
+%%DATADIR%%/skins/skyblue/skindata_menu
+%%DATADIR%%/skins/skyblue/skindata_presets
+%%DATADIR%%/skins/skyblue/skindata_submenu
+%%DATADIR%%/skins/skyblue/slider-vert-24.png
 share/locale/fr/LC_MESSAGES/gqradio.mo
-@dirrm share/doc/gqradio
-@dirrm share/gqradio/skins/default
-@dirrm share/gqradio/skins/skyblue
-@dirrm share/gqradio/skins
-@dirrm share/gqradio
+share/pixmaps/gqradio.png
+@dirrm %%DATADIR%%/skins/skyblue
+@dirrm %%DATADIR%%/skins/default
+@dirrm %%DATADIR%%/skins
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%