Date: Tue, 7 Feb 2006 03:36:05 -0800 (PST) From: Jeremy Chadwick <freebsd@jdc.parodius.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92958: games/nethack34 update (needs additional testing) Message-ID: <20060207113605.E84D85C00F@icarus.home.lan> Resent-Message-ID: <200602071140.k17Be3t1082194@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92958 >Category: ports >Synopsis: games/nethack34 update (needs additional testing) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Feb 07 11:40:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jeremy Chadwick >Release: FreeBSD 6.0-STABLE i386 >Organization: Parodius Networking >Environment: System: FreeBSD icarus.home.lan 6.0-STABLE FreeBSD 6.0-STABLE #0: Mon Jan 30 15:49:06 PST 2006 root@icarus.home.lan:/usr/obj/usr/src/sys/ICARUS i386 >Description: * WITH_MENUCOLORS: Now references jilles' newer site/URL * WITH_MENUCOLORS: Use POSIX-compliant regex via MENU_COLOR_REGEX_POSIX * No more reliance on gnuregex * Squelch patch-time calls to REINPLACE_CMD * Update distinfo to reference new menucolors patch * Update patch-ad to remove -lgnuregex (see below note) * Update patch-ad to remove use of $LIBTTY Tested on the following platforms: 4.11-STABLE (2006/01/12) 5.4-STABLE (2006/01/12) 6.0-STABLE (2006/01/30) I _did not_ test X11/QT support; I need someone to test this to ensure there's no breakage there. NOTE: glewis should snag nh343-menucolor_jilles.diff from http://www.stack.nl/~jilles/games/ and archive it, plus remove the old nh343-menucolor.diff. >How-To-Repeat: n/a >Fix: Apply below patch. diff -ruN nethack34.orig/Makefile nethack34/Makefile --- nethack34.orig/Makefile Mon Feb 6 02:40:04 2006 +++ nethack34/Makefile Tue Feb 7 03:19:45 2006 @@ -46,10 +46,11 @@ .elif ${PKGNAMESUFFIX} == "-nox11" GRAPHICS= # none .if defined(WITH_MENUCOLORS) -PATCHFILES+= nh343-menucolor.diff -PATCH_SITES+= ${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis|} +PATCHFILES+= nh343-menucolor_jilles.diff +PATCH_SITES+= http://www.stack.nl/~jilles/games/ \ + ${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis|} PATCH_DIST_STRIP= -p1 -MAKE_ENV+= LIBTTY="-lgnuregex" +CFLAGS+= -DMENU_COLOR_REGEX_POSIX .endif .elif ${PKGNAMESUFFIX} == "-qt" USE_QT_VER= 3 @@ -62,15 +63,6 @@ .include <bsd.port.pre.mk> -# FreeBSD 5.2.1-RELEASE (or, well, almost) and above use include/gnu/regex.h -# while prior releases use include/gnuregex.h. This simply gets rid of the -# repetitive warning during the build process on 5.x. -.if ${OSVERSION} >= 502010 -GNU_REGEX_H= <gnu/regex.h> -.else -GNU_REGEX_H= <gnuregex.h> -.endif - pre-everything:: @if [ "${PKGBASE}" != "nethack" ]; then \ ${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" ; \ @@ -83,18 +75,14 @@ post-patch: .for f in include/config.h sys/unix/Makefile.src sys/unix/Makefile.top - ${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g;s|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' ${WRKSRC}/${f} + @${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g;s|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' ${WRKSRC}/${f} .endfor - ${REINPLACE_CMD} -e 's|<regex.h>|${GNU_REGEX_H}|g' ${WRKSRC}/src/sounds.c - ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/win/Qt/qt_win.cpp + @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/win/Qt/qt_win.cpp .if defined(WITHOUT_SHELL) - ${REINPLACE_CMD} -e 's|#define SHELL|/* #define SHELL|' ${WRKSRC}/include/unixconf.h -.endif -.if defined(WITH_MENUCOLORS) - ${REINPLACE_CMD} -e 's|<regex.h>|${GNU_REGEX_H}|g' ${WRKSRC}/include/color.h + @${REINPLACE_CMD} -e 's|#define SHELL|/* #define SHELL|' ${WRKSRC}/include/unixconf.h .endif .if defined(WITH_MAIL) - ${REINPLACE_CMD} -e 's|/\* #define MAIL \*/|#define MAIL|' ${WRKSRC}/include/unixconf.h + @${REINPLACE_CMD} -e 's|/\* #define MAIL \*/|#define MAIL|' ${WRKSRC}/include/unixconf.h .endif pre-configure: diff -ruN nethack34.orig/distinfo nethack34/distinfo --- nethack34.orig/distinfo Mon Feb 6 02:40:04 2006 +++ nethack34/distinfo Tue Feb 7 03:19:45 2006 @@ -1,6 +1,6 @@ MD5 (nethack-343-src.tgz) = 21479c95990eefe7650df582426457f9 -SIZE (nethack-343-src.tgz) = 3497458 SHA256 (nethack-343-src.tgz) = bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4 -MD5 (nh343-menucolor.diff) = 42e8c979c0ebe3e799c62056f86935bb -SIZE (nh343-menucolor.diff) = 17914 -SHA256 (nh343-menucolor.diff) = 28ffb66cc901c74f6321a4537f07313363d35cf60a621d829a14d46c080f3913 +SIZE (nethack-343-src.tgz) = 3497458 +MD5 (nh343-menucolor_jilles.diff) = 42e8c979c0ebe3e799c62056f86935bb +SHA256 (nh343-menucolor_jilles.diff) = 28ffb66cc901c74f6321a4537f07313363d35cf60a621d829a14d46c080f3913 +SIZE (nh343-menucolor_jilles.diff) = 17914 diff -ruN nethack34.orig/files/patch-ad nethack34/files/patch-ad --- nethack34.orig/files/patch-ad Thu Jul 1 11:49:43 2004 +++ nethack34/files/patch-ad Tue Feb 7 03:32:09 2006 @@ -66,8 +66,7 @@ # WINTTYLIB = -lcurses # WINTTYLIB = -lcurses16 # WINTTYLIB = -lncurses --WINTTYLIB = -ltermlib -+WINTTYLIB = -ltermlib ${LIBTTY} + WINTTYLIB = -ltermlib # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. @@ -79,7 +78,7 @@ # # libraries for Qt -WINQTLIB = -L$(QTDIR)/lib -lqt -+WINQTLIB = ${QTCFGLIBS} ${LIBQT} -lgnuregex ++WINQTLIB = ${QTCFGLIBS} ${LIBQT} # # libraries for KDE (with Qt) WINKDELIB = -lkdecore -lkdeui -lXext >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060207113605.E84D85C00F>