mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-19 08:13:21 +00:00
Code Issues Releases Activity

* WITH_MENUCOLORS: Now references jilles' newer site/URL

Browse Source 
* 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

PR:		ports/92958
Submitted by:	Jeremy Chadwick <freebsd@jdc.parodius.com> (maintainer)
This commit is contained in:
Pav Lucistnik 2006-05-26 14:56:09 +00:00
parent b5bd0897dd
commit dc8eed9a2e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=163487
3 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
games/nethack34/Makefile
View File

@ -45,10 +45,11 @@ GRAPHICS= GNOME_GRAPHICS
.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
@ -61,15 +62,6 @@ GRAPHICS= QT_GRAPHICS
.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} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" ; \
@ -82,18 +74,14 @@ pre-everything::
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:

8
games/nethack34/distinfo
View File

@ -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

5
games/nethack34/files/patch-ad
View File

@ -66,8 +66,7 @@ diff -ruN sys.orig/unix/Makefile.src sys/unix/Makefile.src
# 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 @@ diff -ruN sys.orig/unix/Makefile.src sys/unix/Makefile.src
#
# libraries for Qt
-WINQTLIB = -L$(QTDIR)/lib -lqt
+WINQTLIB = ${QTCFGLIBS} ${LIBQT} -lgnuregex
+WINQTLIB = ${QTCFGLIBS} ${LIBQT}
#
# libraries for KDE (with Qt)
WINKDELIB = -lkdecore -lkdeui -lXext