Date: Sun, 1 Jul 2001 17:09:06 -0400 (EDT) From: pat@databits.net To: FreeBSD-gnats-submit@freebsd.org Cc: pfeifer@dbai.tuwien.ac.at Subject: ports/28608: Update port: emulators/wine Message-ID: <200107012109.f61L96D26300@wlgrv1.pa.home.com>
next in thread | raw e-mail | index | archive | help
>Number: 28608
>Category: ports
>Synopsis: Update port: emulators/wine
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 01 14:10:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: Patrick Li
>Release: FreeBSD 4.3-STABLE i386
>Organization:
N/A
>Environment:
System: FreeBSD bottlenek 4.3-STABLE FreeBSD 4.3-STABLE #0: Tue Jun 26 15:02:11 EDT 2001 pat@bottlenek:/usr/src/sys/compile/BOTTLENEK i386
>Description:
o Update emulators/wine
o Add NOPORTDOCS support to pkg-plist
o Place docs in standard ${PREFIX}/share/doc/${PORTNAME}
>How-To-Repeat:
N/A
>Fix:
diff -ruN /usr/ports/emulators/wine/Makefile wine/Makefile
--- /usr/ports/emulators/wine/Makefile Sun May 13 20:27:51 2001
+++ wine/Makefile Sun Jul 1 16:43:40 2001
@@ -7,7 +7,7 @@
#
PORTNAME= wine
-PORTVERSION= 2001.05.10
+PORTVERSION= 2001.06.29
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/wine/development
@@ -69,17 +69,17 @@
${INSTALL_DATA} ${WRKSRC}/documentation/samples/config ${PREFIX}/etc/wine.conf.sample
[ -f ${PREFIX}/etc/wine.conf ] \
|| ${INSTALL_DATA} ${PREFIX}/etc/wine.conf.sample ${PREFIX}/etc/wine.conf
- ${INSTALL_DATA} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.1
- ${INSTALL_DATA} ${WRKSRC}/documentation/wine.conf.man ${PREFIX}/man/man5/wine.conf.5
+ @${INSTALL_MAN} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.1
+ @${INSTALL_MAN} ${WRKSRC}/documentation/wine.conf.man ${PREFIX}/man/man5/wine.conf.5
.if !defined(NOPORTDOCS)
- -@${MKDIR} ${PREFIX}/lib/wine/documentation
+ @${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
.for i in README ANNOUNCE AUTHORS LICENSE WARRANTY documentation/psdrv.reg
- ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/lib/wine/documentation
+ @${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/${PORTNAME}
.endfor
${INSTALL_DATA} ${WRKSRC}/debugger/README \
- ${PREFIX}/lib/wine/documentation/README.debugger
+ ${PREFIX}/share/doc/${PORTNAME}/README.debugger
${INSTALL_DATA} ${WRKSRC}/programs/regapi/README \
- ${PREFIX}/lib/wine/documentation/README.regapi
+ ${PREFIX}/share/doc/${PORTNAME}/README.regapi
.endif
${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl \
${PREFIX}/lib/wine
diff -ruN /usr/ports/emulators/wine/distinfo wine/distinfo
--- /usr/ports/emulators/wine/distinfo Sun May 13 20:27:51 2001
+++ wine/distinfo Sun Jul 1 16:03:00 2001
@@ -1 +1 @@
-MD5 (Wine-20010510.tar.gz) = 6e1840a294845fa0db85704b1fc6728e
+MD5 (Wine-20010629.tar.gz) = c81c4abdbe76c93a4d4c30829a128571
diff -ruN /usr/ports/emulators/wine/files/patch-gg wine/files/patch-gg
--- /usr/ports/emulators/wine/files/patch-gg Sun May 13 20:27:51 2001
+++ wine/files/patch-gg Wed Dec 31 19:00:00 1969
@@ -1,38 +0,0 @@
---- dlls/wineps/afm.c 2001/05/09 17:11:59 1.13
-+++ dlls/wineps/afm.c 2001/05/11 11:51:52
-@@ -683,7 +683,7 @@ static BOOL SortFontMetrics()
-
- qsort(aglCopy, PSDRV_AdobeGlyphList.size,
- sizeof(UNICODEGLYPH),
-- (__compar_fn_t)UnicodeGlyphByNameIndex);
-+ UnicodeGlyphByNameIndex);
- }
-
- for (i = 0; i < afm->NumofMetrics; ++i)
-@@ -695,7 +695,7 @@ static BOOL SortFontMetrics()
-
- pug = bsearch(&ug, aglCopy, PSDRV_AdobeGlyphList.size,
- sizeof(UNICODEGLYPH),
-- (__compar_fn_t)UnicodeGlyphByNameIndex);
-+ UnicodeGlyphByNameIndex);
- if (pug == NULL)
- {
- WARN("Glyph '%s' in font '%s' does not have a UV\n",
-@@ -715,7 +715,7 @@ static BOOL SortFontMetrics()
-
- /* typecast avoids compiler warning */
- qsort((void *)(afm->Encoding->glyphs), afm->Encoding->size,
-- sizeof(UNICODEGLYPH), (__compar_fn_t)UnicodeGlyphByUV);
-+ sizeof(UNICODEGLYPH), UnicodeGlyphByUV);
-
- for (i = 0; i < afm->Encoding->size; ++i)
- if (afm->Encoding->glyphs[i].UV >= 0)
-@@ -726,7 +726,7 @@ static BOOL SortFontMetrics()
- }
-
- qsort(afm->Metrics, afm->NumofMetrics, sizeof(AFMMETRICS),
-- (__compar_fn_t)AFMMetricsByUV);
-+ AFMMetricsByUV);
-
- for (i = 0; i < afm->NumofMetrics; ++i)
- if (afm->Metrics[i].UV >= 0)
diff -ruN /usr/ports/emulators/wine/pkg-plist wine/pkg-plist
--- /usr/ports/emulators/wine/pkg-plist Sun May 13 20:27:51 2001
+++ wine/pkg-plist Sun Jul 1 16:41:08 2001
@@ -184,14 +184,6 @@
lib/wine/bug_report.pl
lib/wine/reg/regFixer.pl
lib/wine/reg/regRestorer.pl
-lib/wine/documentation/ANNOUNCE
-lib/wine/documentation/AUTHORS
-lib/wine/documentation/LICENSE
-lib/wine/documentation/WARRANTY
-lib/wine/documentation/README
-lib/wine/documentation/psdrv.reg
-lib/wine/documentation/README.debugger
-lib/wine/documentation/README.regapi
lib/wine/libadvapi32.so
lib/wine/libavifil32.so
lib/wine/libavifile.so
@@ -311,10 +303,18 @@
lib/wine/libwprocs.so
lib/wine/libwsock32.so
lib/wine/libx11drv.so
+%%PORTDOCS%%share/doc/wine/ANNOUNCE
+%%PORTDOCS%%share/doc/wine/AUTHORS
+%%PORTDOCS%%share/doc/wine/LICENSE
+%%PORTDOCS%%share/doc/wine/WARRANTY
+%%PORTDOCS%%share/doc/wine/README
+%%PORTDOCS%%share/doc/wine/psdrv.reg
+%%PORTDOCS%%share/doc/wine/README.debugger
+%%PORTDOCS%%share/doc/wine/README.regapi
@dirrm include/wine/msvcrt/sys
@dirrm include/wine/msvcrt
@dirrm include/wine/wine
@dirrm include/wine
@dirrm lib/wine/reg
-@dirrm lib/wine/documentation
+%%PORTDOCS%%@dirrm share/doc/wine
@dirrm lib/wine
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200107012109.f61L96D26300>