diff options
author | Jun Kuriyama <kuriyama@FreeBSD.org> | 1998-10-09 05:32:34 +0000 |
---|---|---|
committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 1998-10-09 05:32:34 +0000 |
commit | 307530aae7329d78db6bcab482363facc1e3af02 (patch) | |
tree | 9ea261af6d59600f78786a56c5b6ea50a20b8745 /emulators/wine-devel | |
parent | Change MASTER_SITE to fetch distfiles. (diff) |
Update to 980927.
Submitted by: Stefan Esser <se@mi.uni-koeln.de>
Notes
Notes:
svn path=/head/; revision=13777
Diffstat (limited to 'emulators/wine-devel')
-rw-r--r-- | emulators/wine-devel/Makefile | 12 | ||||
-rw-r--r-- | emulators/wine-devel/distinfo | 2 | ||||
-rw-r--r-- | emulators/wine-devel/files/patch-ar | 40 |
3 files changed, 42 insertions, 12 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 93702f15801d..05c9a4d051a1 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -3,12 +3,12 @@ # Date created: Sa 9 Nov 1996 00:52:22 MET # Whom: se # -# $Id: Makefile,v 1.60 1998/09/15 11:13:06 asami Exp $ +# $Id: Makefile,v 1.61 1998/09/17 00:32:31 asami Exp $ # -DATE= 980517 +DATE= 980927 DISTNAME= Wine-${DATE} -PKGNAME= wine-98.05.17 +PKGNAME= wine-98.09.27 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development @@ -17,10 +17,14 @@ MAINTAINER= se@FreeBSD.ORG LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm -WRKSRC= ${WRKDIR}/wine${DATE} +WRKSRC= ${WRKDIR}/wine-${DATE} GNU_CONFIGURE= yes MAN1= wine.1 +post-extract: + -${MKDIR} ${WRKSRC}/include/asm + ${CP} ${FILESDIR}/bitops.h ${WRKSRC}/include/asm/bitops.h + pre-configure: @${ECHO} "WINE_INI_GLOBAL \"${PREFIX}/etc/wine.conf\"" \ >> ${WRKSRC}/autoconf.h diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 0c0647835678..ab71f8fb5b32 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1 +1 @@ -MD5 (Wine-980517.tar.gz) = cec344cafc35c17360c3ad85eed32428 +MD5 (Wine-980927.tar.gz) = 879a40564002a34d24fe5b2cffe09a65 diff --git a/emulators/wine-devel/files/patch-ar b/emulators/wine-devel/files/patch-ar index 60c8a2836a98..00a464f7e514 100644 --- a/emulators/wine-devel/files/patch-ar +++ b/emulators/wine-devel/files/patch-ar @@ -1,11 +1,37 @@ -*** configure~ Wed Dec 24 11:12:03 1997 ---- configure Wed Dec 24 11:18:45 1997 +*** configure.orig Sun Sep 27 19:09:55 1998 +--- configure Fri Oct 2 21:29:19 1998 *************** -*** 2462,2465 **** ---- 2462,2467 ---- - trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 +*** 2355,2359 **** + ; return 0; } + EOF +! if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + ac_cv_c_extern_prefix="yes" +--- 2354,2358 ---- + ; return 0; } + EOF +! if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) </dev/null 2>&5; } && test -s conftest; then + rm -rf conftest* + ac_cv_c_extern_prefix="yes" +*************** +*** 2396,2400 **** + ; return 0; } + EOF +! if { (eval echo configure:2399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + ac_cv_c_asm_string="yes" +--- 2395,2399 ---- + ; return 0; } + EOF +! if { (eval echo configure:2399: \"$ac_link\") 1>&5; (eval $ac_link) </dev/null 2>&5; } && test -s conftest; then + rm -rf conftest* + ac_cv_c_asm_string="yes" +*************** +*** 3440,3443 **** +--- 3439,3444 ---- -+ LDLIBS="$LDLIBS -lxpg4" + trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + - DEFS=-DHAVE_CONFIG_H ++ LDLIBS="$LDLIBS -lxpg4" + DEFS=-DHAVE_CONFIG_H |