ports/159749: [patch] emulators/wine: fix pkg-plist, use PORTDOCS and PORTDATA

Anatoly Borodin anatoly.borodin at gmail.com
Sat Aug 13 22:40:07 UTC 2011 

>Number:         159749
>Category:       ports
>Synopsis:       [patch] emulators/wine: fix pkg-plist, use PORTDOCS and PORTDATA
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 13 22:40:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Anatoly Borodin
>Release:        
>Organization:
>Environment:
>Description:
The current version of the emulators/wine port can find alsa and gstreamer if they are installed, winealsa.drv and winegstreamer.dll will be created then, and they are missing in the pkg-plist file. To fix it, --without-alsa and --without-gstreamer can be used, but I made options instead. An option for mpg123 was added, too.
>How-To-Repeat:

>Fix:
This is a cumulative patch with the following fixes:

* add options ALSA, MPG123, GSTREAMER
                                                             
* USE_LDCONFIG32 was used inappropriately (portlint was angry, and nobody uses this variable that way)

* move the LICENSE block higher (portlint was angry)

* remove unneeded dirrmtry's 
                                                                       
* use PORTDOCS and PORTDATA (make pkg-plist smaller)

The maintainer is free to apply any subset of them. The separate patches will be attached to this pr, can also be found here: https://gist.github.com/1144321

Patch attached with submission follows:

>From 0cd9c7edf90f7d599e79b160894cad3666b00ed3 Mon Sep 17 00:00:00 2001
From: Anatoly Borodin <anatoly.borodin at gmail.com>
Date: Sat, 13 Aug 2011 06:03:04 +0200
Subject: [PATCH] TBC: emulators/wine: cumulative

add options ALSA, MPG123, GSTREAMER
USE_LDCONFIG32 was used inappropriately
move the LICENSE block higher
remove unneeded dirrmtry's
use PORTDOCS and PORTDATA
---
 emulators/wine/Makefile  |   52 +++++++++++++++++++++++++++++++------
 emulators/wine/pkg-plist |   63 ++++-----------------------------------------
 2 files changed, 49 insertions(+), 66 deletions(-)

diff --git emulators/wine/Makefile emulators/wine/Makefile
index 3143ee6..4809440 100644
--- emulators/wine/Makefile
+++ emulators/wine/Makefile
@@ -16,6 +16,10 @@ MASTER_SITES=	SF/${PORTNAME}/Source \
 MAINTAINER=	gerald at 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,23 +28,17 @@ 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-mpg123 --with-oss --without-sane \
+		--with-oss --without-sane \
 		--without-v4l --without-xcomposite --without-xinerama
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		FLEX="${LOCALBASE}/bin/flex"
 WINELIBDIR?=	${PREFIX}/lib
-.if !defined(USE_LDCONFIG32)
 USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
-.endif
 MAKE_JOBS_SAFE=	yes
 MAN1=		msiexec.1 notepad.1 regedit.1 regsvr32.1 widl.1 wine.1 \
 		wineboot.1 winebuild.1 winecfg.1 wineconsole.1 winedbg.1 \
@@ -64,8 +62,17 @@ OPTIONS=	CUPS	"Use CUPS (Common UNIX Printing System)"	Off \
 		LDAP	"Use LDAP"					Off \
 		LIBXSLT	"Use libxslt (only used by msxml3.dll)"		Off \
 		OPENAL	"Use OpenAL (3D audio library)"			Off \
+		ALSA	"Use ALSA (winealsa.drv)"			Off \
+		MPG123	"Use mpg123 (winemp3.acm)"			Off \
+		GSTREAMER "Use GStreamer (winegstreamer.dll)"		Off \
 		WINEMAKER "Fully support winemaker (requires Perl)"	Off
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
+PORTDATA=	*
+
 .include <bsd.port.pre.mk>
 
 .ifdef WITHOUT_CUPS
@@ -106,10 +113,37 @@ 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_ALSA
+CONFIGURE_ARGS+=	--with-alsa
+LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+PLIST_SUB+=		ALSA=""
+.else
+CONFIGURE_ARGS+=	--without-alsa
+PLIST_SUB+=		ALSA="@comment "
+.endif
+
+.ifdef WITH_MPG123
+CONFIGURE_ARGS+=	--with-mpg123
+LIB_DEPENDS+=	mpg123.0:${PORTSDIR}/audio/mpg123
+PLIST_SUB+=		MPG123=""
+.else
+CONFIGURE_ARGS+=	--without-mpg123
+PLIST_SUB+=		MPG123="@comment "
+.endif
+
+.ifdef WITH_GSTREAMER
+CONFIGURE_ARGS+=	--with-gstreamer
+USE_GSTREAMER=		yes
+PLIST_SUB+=		GSTREAMER=""
+.else
+CONFIGURE_ARGS+=	--without-gstreamer
+PLIST_SUB+=		GSTREAMER="@comment "
 .endif
 
 .ifdef WITH_WINEMAKER
diff --git emulators/wine/pkg-plist emulators/wine/pkg-plist
index 9cd98c6..af9112f 100644
--- emulators/wine/pkg-plist
+++ emulators/wine/pkg-plist
@@ -1237,6 +1237,7 @@ lib/wine/fakedlls/win87em.dll16
 lib/wine/fakedlls/winaspi.dll16
 lib/wine/fakedlls/windebug.dll16
 lib/wine/fakedlls/windowscodecs.dll
+%%ALSA%%lib/wine/fakedlls/winealsa.drv
 lib/wine/fakedlls/wineboot.exe
 lib/wine/fakedlls/winebrowser.exe
 lib/wine/fakedlls/winecfg.exe
@@ -1245,9 +1246,11 @@ lib/wine/fakedlls/wined3d.dll
 lib/wine/fakedlls/winedbg.exe
 lib/wine/fakedlls/winedevice.exe
 lib/wine/fakedlls/winefile.exe
+%%GSTREAMER%%lib/wine/fakedlls/winegstreamer.dll
 lib/wine/fakedlls/winemapi.dll
 lib/wine/fakedlls/winemenubuilder.exe
 lib/wine/fakedlls/winemine.exe
+%%MPG123%%lib/wine/fakedlls/winemp3.acm
 lib/wine/fakedlls/winemsibuilder.exe
 lib/wine/fakedlls/wineoss.drv
 lib/wine/fakedlls/winepath.exe
@@ -1733,6 +1736,7 @@ lib/wine/win87em.dll16.so
 lib/wine/winaspi.dll16.so
 lib/wine/windebug.dll16.so
 lib/wine/windowscodecs.dll.so
+%%ALSA%%lib/wine/winealsa.drv.so
 lib/wine/wineboot.exe.so
 lib/wine/winebrowser.exe.so
 lib/wine/winecfg.exe.so
@@ -1741,9 +1745,11 @@ lib/wine/wined3d.dll.so
 lib/wine/winedbg.exe.so
 lib/wine/winedevice.exe.so
 lib/wine/winefile.exe.so
+%%GSTREAMER%%lib/wine/winegstreamer.dll.so
 lib/wine/winemapi.dll.so
 lib/wine/winemenubuilder.exe.so
 lib/wine/winemine.exe.so
+%%MPG123%%lib/wine/winemp3.acm.so
 lib/wine/winemsibuilder.exe.so
 lib/wine/wineoss.drv.so
 lib/wine/winepath.exe.so
@@ -1793,63 +1799,6 @@ 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%%
- at dirrm %%DATADIR%%/fonts
- at dirrmtry %%DATADIR%%
- at dirrmtry %%DATADIR%%/aclocal
- at dirrmtry %%DATADIR%%
- at dirrmtry share/applications
 @dirrm lib/wine/fakedlls
 @dirrm lib/wine
 @dirrm include/wine/windows/ddk
-- 
1.7.6



>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list