Move LICENSE, LICENSE_COMB and LICENSE_FILE up to appease new portlint. [1]

Use PORTDATA which allows simplifying pkg-plist significantly. [1][2]
Explicitly disable ALSA support. [2]
Add to PLIST_SUB instead of just setting it (for the OPENAL knob). [1]

Bump PORTREVISION due to the potentially fixed package list.

PR:		159749
Submitted by:	Anatoly Borodin <anatoly.borodin@gmail.com> [1]
Inspired by:	Anatoly Borodin <anatoly.borodin@gmail.com> [2]

4 files changed, 26 insertions, 118 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 03338b7f476f..4d58168be7d3 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	1.3.26
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -16,6 +17,10 @@ MASTER_SITES=	SF/${PORTNAME}/Source \
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Microsoft Windows compatibility layer for Unix-like systems
 
+LICENSE=	LGPL21 LGPL3
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype.9:${PORTSDIR}/print/freetype2 \
@@ -24,17 +29,14 @@ LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		png.6:${PORTSDIR}/graphics/png \
 		xml2:${PORTSDIR}/textproc/libxml2
 
-LICENSE=	LGPL21 LGPL3
-LICENSE_COMB=	dual
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
 CPPFLAGS=	"-I${LOCALBASE}/include"
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--verbose --disable-tests \
-		--with-glu --with-opengl --with-xrandr \
-		--without-capi --without-gphoto --without-gsm \
+		--without-alsa --without-capi --with-glu \
+		--without-gphoto --without-gsm --with-opengl \
 		--without-mpg123 --with-oss --without-sane \
-		--without-v4l --without-xcomposite --without-xinerama
+		--without-v4l --without-xcomposite --without-xinerama \
+		--with-xrandr
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		FLEX="${LOCALBASE}/bin/flex"
 WINELIBDIR?=	${PREFIX}/lib
@@ -66,6 +68,8 @@ OPTIONS=	CUPS	"Use CUPS (Common UNIX Printing System)"	Off \
 		OPENAL	"Use OpenAL (3D audio library)"			Off \
 		WINEMAKER "Fully support winemaker (requires Perl)"	Off
 
+PORTDATA=	fonts/ generic.ppd l_intl.nls wine.inf
+
 .include <bsd.port.pre.mk>
 
 .ifdef WITHOUT_CUPS
@@ -106,10 +110,10 @@ CONFIGURE_ARGS+=	--without-xslt
 .ifdef WITH_OPENAL
 CONFIGURE_ARGS+=	--with-openal
 USE_OPENAL=		yes
-PLIST_SUB=		OPENAL=""
+PLIST_SUB+=		OPENAL=""
 .else
 CONFIGURE_ARGS+=	--without-openal
-PLIST_SUB=		OPENAL="@comment "
+PLIST_SUB+=		OPENAL="@comment "
 .endif
 
 .ifdef WITH_WINEMAKER
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 9cd98c6e9094..acca9a2da842 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -1793,62 +1793,12 @@ lib/wine/xinput1_3.dll.so
 lib/wine/xinput9_1_0.dll.so
 lib/wine/xmllite.dll.so
 share/applications/wine.desktop
-%%DATADIR%%/generic.ppd
-%%DATADIR%%/l_intl.nls
-%%DATADIR%%/wine.inf
-%%DATADIR%%/fonts/coue1255.fon
-%%DATADIR%%/fonts/coue1256.fon
-%%DATADIR%%/fonts/coue1257.fon
-%%DATADIR%%/fonts/coure.fon
-%%DATADIR%%/fonts/couree.fon
-%%DATADIR%%/fonts/coureg.fon
-%%DATADIR%%/fonts/courer.fon
-%%DATADIR%%/fonts/couret.fon
-%%DATADIR%%/fonts/cvgasys.fon
-%%DATADIR%%/fonts/hvgasys.fon
-%%DATADIR%%/fonts/jsmalle.fon
-%%DATADIR%%/fonts/jvgasys.fon
-%%DATADIR%%/fonts/marlett.ttf
-%%DATADIR%%/fonts/smae1255.fon
-%%DATADIR%%/fonts/smae1256.fon
-%%DATADIR%%/fonts/smae1257.fon
-%%DATADIR%%/fonts/smalle.fon
-%%DATADIR%%/fonts/smallee.fon
-%%DATADIR%%/fonts/smalleg.fon
-%%DATADIR%%/fonts/smaller.fon
-%%DATADIR%%/fonts/smallet.fon
-%%DATADIR%%/fonts/ssee1255.fon
-%%DATADIR%%/fonts/ssee1256.fon
-%%DATADIR%%/fonts/ssee1257.fon
-%%DATADIR%%/fonts/ssee874.fon
-%%DATADIR%%/fonts/sserife.fon
-%%DATADIR%%/fonts/sserifee.fon
-%%DATADIR%%/fonts/sserifeg.fon
-%%DATADIR%%/fonts/sserifer.fon
-%%DATADIR%%/fonts/sserifet.fon
-%%DATADIR%%/fonts/svgasys.fon
-%%DATADIR%%/fonts/symbol.ttf
-%%DATADIR%%/fonts/tahoma.ttf
-%%DATADIR%%/fonts/tahomabd.ttf
-%%DATADIR%%/fonts/vgas1255.fon
-%%DATADIR%%/fonts/vgas1256.fon
-%%DATADIR%%/fonts/vgas1257.fon
-%%DATADIR%%/fonts/vgas874.fon
-%%DATADIR%%/fonts/vgasys.fon
-%%DATADIR%%/fonts/vgasyse.fon
-%%DATADIR%%/fonts/vgasysg.fon
-%%DATADIR%%/fonts/vgasysr.fon
-%%DATADIR%%/fonts/vgasyst.fon
 %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.winedbg
 %%PORTDOCS%%%%DOCSDIR%%/README.winedump
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/fonts
-@dirrmtry %%DATADIR%%
-@dirrmtry %%DATADIR%%/aclocal
-@dirrmtry %%DATADIR%%
 @dirrmtry share/applications
 @dirrm lib/wine/fakedlls
 @dirrm lib/wine
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 03338b7f476f..4d58168be7d3 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	1.3.26
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -16,6 +17,10 @@ MASTER_SITES=	SF/${PORTNAME}/Source \
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Microsoft Windows compatibility layer for Unix-like systems
 
+LICENSE=	LGPL21 LGPL3
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype.9:${PORTSDIR}/print/freetype2 \
@@ -24,17 +29,14 @@ LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		png.6:${PORTSDIR}/graphics/png \
 		xml2:${PORTSDIR}/textproc/libxml2
 
-LICENSE=	LGPL21 LGPL3
-LICENSE_COMB=	dual
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
 CPPFLAGS=	"-I${LOCALBASE}/include"
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--verbose --disable-tests \
-		--with-glu --with-opengl --with-xrandr \
-		--without-capi --without-gphoto --without-gsm \
+		--without-alsa --without-capi --with-glu \
+		--without-gphoto --without-gsm --with-opengl \
 		--without-mpg123 --with-oss --without-sane \
-		--without-v4l --without-xcomposite --without-xinerama
+		--without-v4l --without-xcomposite --without-xinerama \
+		--with-xrandr
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		FLEX="${LOCALBASE}/bin/flex"
 WINELIBDIR?=	${PREFIX}/lib
@@ -66,6 +68,8 @@ OPTIONS=	CUPS	"Use CUPS (Common UNIX Printing System)"	Off \
 		OPENAL	"Use OpenAL (3D audio library)"			Off \
 		WINEMAKER "Fully support winemaker (requires Perl)"	Off
 
+PORTDATA=	fonts/ generic.ppd l_intl.nls wine.inf
+
 .include <bsd.port.pre.mk>
 
 .ifdef WITHOUT_CUPS
@@ -106,10 +110,10 @@ CONFIGURE_ARGS+=	--without-xslt
 .ifdef WITH_OPENAL
 CONFIGURE_ARGS+=	--with-openal
 USE_OPENAL=		yes
-PLIST_SUB=		OPENAL=""
+PLIST_SUB+=		OPENAL=""
 .else
 CONFIGURE_ARGS+=	--without-openal
-PLIST_SUB=		OPENAL="@comment "
+PLIST_SUB+=		OPENAL="@comment "
 .endif
 
 .ifdef WITH_WINEMAKER
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 9cd98c6e9094..acca9a2da842 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -1793,62 +1793,12 @@ lib/wine/xinput1_3.dll.so
 lib/wine/xinput9_1_0.dll.so
 lib/wine/xmllite.dll.so
 share/applications/wine.desktop
-%%DATADIR%%/generic.ppd
-%%DATADIR%%/l_intl.nls
-%%DATADIR%%/wine.inf
-%%DATADIR%%/fonts/coue1255.fon
-%%DATADIR%%/fonts/coue1256.fon
-%%DATADIR%%/fonts/coue1257.fon
-%%DATADIR%%/fonts/coure.fon
-%%DATADIR%%/fonts/couree.fon
-%%DATADIR%%/fonts/coureg.fon
-%%DATADIR%%/fonts/courer.fon
-%%DATADIR%%/fonts/couret.fon
-%%DATADIR%%/fonts/cvgasys.fon
-%%DATADIR%%/fonts/hvgasys.fon
-%%DATADIR%%/fonts/jsmalle.fon
-%%DATADIR%%/fonts/jvgasys.fon
-%%DATADIR%%/fonts/marlett.ttf
-%%DATADIR%%/fonts/smae1255.fon
-%%DATADIR%%/fonts/smae1256.fon
-%%DATADIR%%/fonts/smae1257.fon
-%%DATADIR%%/fonts/smalle.fon
-%%DATADIR%%/fonts/smallee.fon
-%%DATADIR%%/fonts/smalleg.fon
-%%DATADIR%%/fonts/smaller.fon
-%%DATADIR%%/fonts/smallet.fon
-%%DATADIR%%/fonts/ssee1255.fon
-%%DATADIR%%/fonts/ssee1256.fon
-%%DATADIR%%/fonts/ssee1257.fon
-%%DATADIR%%/fonts/ssee874.fon
-%%DATADIR%%/fonts/sserife.fon
-%%DATADIR%%/fonts/sserifee.fon
-%%DATADIR%%/fonts/sserifeg.fon
-%%DATADIR%%/fonts/sserifer.fon
-%%DATADIR%%/fonts/sserifet.fon
-%%DATADIR%%/fonts/svgasys.fon
-%%DATADIR%%/fonts/symbol.ttf
-%%DATADIR%%/fonts/tahoma.ttf
-%%DATADIR%%/fonts/tahomabd.ttf
-%%DATADIR%%/fonts/vgas1255.fon
-%%DATADIR%%/fonts/vgas1256.fon
-%%DATADIR%%/fonts/vgas1257.fon
-%%DATADIR%%/fonts/vgas874.fon
-%%DATADIR%%/fonts/vgasys.fon
-%%DATADIR%%/fonts/vgasyse.fon
-%%DATADIR%%/fonts/vgasysg.fon
-%%DATADIR%%/fonts/vgasysr.fon
-%%DATADIR%%/fonts/vgasyst.fon
 %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.winedbg
 %%PORTDOCS%%%%DOCSDIR%%/README.winedump
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/fonts
-@dirrmtry %%DATADIR%%
-@dirrmtry %%DATADIR%%/aclocal
-@dirrmtry %%DATADIR%%
 @dirrmtry share/applications
 @dirrm lib/wine/fakedlls
 @dirrm lib/wine