diff options
author | glewis <glewis@FreeBSD.org> | 2003-08-13 00:41:24 +0800 |
---|---|---|
committer | glewis <glewis@FreeBSD.org> | 2003-08-13 00:41:24 +0800 |
commit | 58cc0c897915144d744e76d22a2a7176f3579320 (patch) | |
tree | cce40c35b42d7993b9e482ed4b69665573f8ca5a /games | |
parent | dd885437f504a0ac60be2fbc390c8a823dc5f661 (diff) | |
download | freebsd-ports-gnome-58cc0c897915144d744e76d22a2a7176f3579320.tar.gz freebsd-ports-gnome-58cc0c897915144d744e76d22a2a7176f3579320.tar.zst freebsd-ports-gnome-58cc0c897915144d744e76d22a2a7176f3579320.zip |
. Don't override the CFLAGS and CC settings.
. Install with the ports infrastructure defined versions of tools, don't
hardcode them.
Obtained from: NetBSD (mostly)
Diffstat (limited to 'games')
-rw-r--r-- | games/moria/Makefile | 4 | ||||
-rw-r--r-- | games/moria/files/patch-unix::Makefile | 56 |
2 files changed, 47 insertions, 13 deletions
diff --git a/games/moria/Makefile b/games/moria/Makefile index f59b42fd19c6..dd98b6322745 100644 --- a/games/moria/Makefile +++ b/games/moria/Makefile @@ -21,7 +21,8 @@ USE_REINPLACE= yes MAN6= moria.6 WRKSRC= ${WRKDIR}/umoria ALL_TARGET= moria -MAKE_ENV+= DOCSDIR="${DOCSDIR}" MKDIR="${MKDIR}" +MAKE_ENV+= DOCSDIR="${DOCSDIR}" MKDIR="${MKDIR}" CHOWN="${CHOWN}" \ + CHGRP="${CHGRP}" CHMOD="${CHMOD}" TOUCH="${TOUCH}" do-configure: for i in ${WRKSRC}/source/config.h ${WRKSRC}/unix/Makefile; do \ @@ -36,7 +37,6 @@ post-install: done .endif .if !defined(NOPORTDOCS) -# cd ${WRKSRC}/doc && $(MAKE) MKDIR="${MKDIR}" DOCSDIR="${DOCSDIR}" INSTALL_DATA="${INSTALL_DATA}" install cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install .endif diff --git a/games/moria/files/patch-unix::Makefile b/games/moria/files/patch-unix::Makefile index d2706e76ba50..281059488f5a 100644 --- a/games/moria/files/patch-unix::Makefile +++ b/games/moria/files/patch-unix::Makefile @@ -1,8 +1,8 @@ $FreeBSD$ --- unix/Makefile.orig Thu Jul 21 16:37:08 1994 -+++ unix/Makefile Wed Aug 6 16:17:52 2003 -@@ -3,10 +3,10 @@ ++++ unix/Makefile Tue Aug 12 10:12:16 2003 +@@ -3,15 +3,15 @@ # LIBDIR must be the same directory defined in config.h # OWNER is who you want the game to be chown to. # GROUP is who you wnat the game to be chgrp to. @@ -17,15 +17,49 @@ $FreeBSD$ # For testing and debugging the program, it is best to use this line. # CFLAGS = -g -@@ -60,9 +60,11 @@ + # For playing the game, you may want to use this line +-CFLAGS = -O ++#CFLAGS = -O + + # For BSD Systems + CURSES = -lcurses -ltermcap +@@ -26,7 +26,7 @@ + # Normal systems don't require anything here. + LFLAGS = + +-CC = cc ++#CC = cc + + SRCS = main.c misc1.c misc2.c misc3.c misc4.c store1.c files.c io.c \ + create.c desc.c generate.c sets.c dungeon.c creature.c death.c \ +@@ -60,17 +60,19 @@ # you must define BINDIR and LIBDIR before installing # assumes that BINDIR and LIBDIR exist install: -+ -mkdir -p $(BINDIR) - chmod 755 $(BINDIR) - cp moria $(BINDIR) - chmod 4711 $(BINDIR)/moria -+ -mkdir -p $(LIBDIR) - chmod 711 $(LIBDIR) - (cd files; cp $(LIBFILES) $(LIBDIR)) - (cd $(LIBDIR); chmod 444 $(LIBFILES)) +- chmod 755 $(BINDIR) +- cp moria $(BINDIR) +- chmod 4711 $(BINDIR)/moria +- chmod 711 $(LIBDIR) +- (cd files; cp $(LIBFILES) $(LIBDIR)) +- (cd $(LIBDIR); chmod 444 $(LIBFILES)) +- (cd $(LIBDIR); touch scores; chmod 644 scores) +- chown $(OWNER) $(BINDIR)/moria +- chgrp $(GROUP) $(BINDIR)/moria +- (cd $(LIBDIR); chown $(OWNER) $(LIBFILES) scores) +- (cd $(LIBDIR); chgrp $(GROUP) $(LIBFILES) scores) ++ -${MKDIR} $(BINDIR) ++ ${CHMOD} 755 $(BINDIR) ++ ${BSD_INSTALL_PROGRAM} moria $(BINDIR) ++ ${CHMOD} 4711 $(BINDIR)/moria ++ -${MKDIR} $(LIBDIR) ++ ${CHMOD} 711 $(LIBDIR) ++ (cd files; ${BSD_INSTALL_DATA} $(LIBFILES) $(LIBDIR)) ++ (cd $(LIBDIR); ${CHMOD} 444 $(LIBFILES)) ++ (cd $(LIBDIR); ${TOUCH} scores; ${CHMOD} 644 scores) ++ ${CHOWN} $(OWNER) $(BINDIR)/moria ++ ${CHGRP} $(GROUP) $(BINDIR)/moria ++ (cd $(LIBDIR); ${CHOWN} $(OWNER) $(LIBFILES) scores) ++ (cd $(LIBDIR); ${CHGRP} $(GROUP) $(LIBFILES) scores) + # If you are short on disk space, or aren't interested in debugging moria. + # strip $(BINDIR)/moria + |