testing/nbsdgames: actually use the upstream makefile

This commit is contained in:
psykose 2022-05-06 21:14:47 +00:00
parent 20f99e08a5
commit cd6aa2d97a
No known key found for this signature in database
2 changed files with 25 additions and 26 deletions

View File

@ -12,7 +12,8 @@ options="!check"
makedepends="ncurses-dev" makedepends="ncurses-dev"
subpackages="$pkgname-doc" subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/abakh/nbsdgames/archive/refs/tags/v$pkgver.tar.gz source="$pkgname-$pkgver.tar.gz::https://github.com/abakh/nbsdgames/archive/refs/tags/v$pkgver.tar.gz
fix-makefile-path.patch" fix-makefile-path.patch
"
build() { build() {
make all make all
@ -31,5 +32,5 @@ package() {
sha512sums=" sha512sums="
04fcc7628b7310bcbebf8ae7e1462605b2a4aa3bc7c50758e8fc54836d18c3d320a1ba5c766d388912d8f9a7a49bf78ba654f1430fdda730daa80ff189f49ffc nbsdgames-5.tar.gz 04fcc7628b7310bcbebf8ae7e1462605b2a4aa3bc7c50758e8fc54836d18c3d320a1ba5c766d388912d8f9a7a49bf78ba654f1430fdda730daa80ff189f49ffc nbsdgames-5.tar.gz
02c35c021b475d6d88e19c899d6aa78284411e5c7d7a3cbffa3f8d9a374acfe5403894a63a06c6e7e15c107fe81416c0c20597fe184784a682ba9b1af08ad261 fix-makefile-path.patch 2a76cbdba6b150ef445637b3daf7b51a325f5bd88d5e8feb773d725c22c272c4100cae5da84843aafbb71c440d5b2cab1f006f82abd41c31f37a1ad9cd287015 fix-makefile-path.patch
" "

View File

@ -1,42 +1,40 @@
diff --git a/Makefile b/Makefile
index 49cb8fd..1ad7867 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -2,83 +2,65 @@ @@ -2,83 +2,65 @@
#-O3 --std=c99 -lcurses -DNO_MOUSE for NetBSD curses #-O3 --std=c99 -lcurses -DNO_MOUSE for NetBSD curses
#adding --std=c99 makes warnings in GNU, and the blame is upon glibc feature test macros. my code is correct. #adding --std=c99 makes warnings in GNU, and the blame is upon glibc feature test macros. my code is correct.
-
-GAMES_DIR?=/usr/games
-SCORES_DIR?=/var/games
-MAN_DIR?=/usr/share/man/man6
-CFLAGS+= -Wno-unused-result -D SCORES_DIR=\"$(SCORES_DIR)\"
-LDFLAGS+= -lncurses -lm
+GAMES_DIR?=$(PREFIX)/usr/bin +GAMES_DIR?=$(PREFIX)/usr/bin
+SCORES_DIR?=$(PREFIX)/var/games +SCORES_DIR?=$(PREFIX)/var/games
+MAN_DIR?=$(PREFIX)/usr/share/man/man6 +MAN_DIR?=$(PREFIX)/usr/share/man/man6
+CFLAGS+= -Wno-unused-result -DSCORES_DIR=\"$(SCORES_DIR)\" +CFLAGS+= -Wno-unused-result -DSCORES_DIR=\"$(SCORES_DIR)\"
+LIBS_PKG_CONFIG!=pkg-config --libs --cflags ncurses +LIBS_PKG_CONFIG!=pkg-config --libs --cflags ncurses
+LIBS=$(LIBS_PKG_CONFIG) -lm +LIBS=$(LIBS_PKG_CONFIG) -lm
-GAMES_DIR?=/usr/games
-SCORES_DIR?=/var/games
-MAN_DIR?=/usr/share/man/man6
-CFLAGS+= -Wno-unused-result -D SCORES_DIR=\"$(SCORES_DIR)\"
-LDFLAGS+= -lncurses -lm
-
ALL= nbsdgames jewels sudoku mines reversi checkers battleship rabbithole sos pipes fifteen memoblocks fisher muncher miketron redsquare darrt snakeduel tugow ALL= nbsdgames jewels sudoku mines reversi checkers battleship rabbithole sos pipes fifteen memoblocks fisher muncher miketron redsquare darrt snakeduel tugow
SCORE_FILES= pipes_scores jewels_scores miketron_scores muncher_scores fisher_scores darrt_scores tugow_scores SCORE_FILES= pipes_scores jewels_scores miketron_scores muncher_scores fisher_scores darrt_scores tugow_scores
-all: $(ALL) -all: $(ALL)
+all: $(ALL) +all: $(ALL)
scorefiles: scorefiles:
- for sf in $(SCORE_FILES); do touch $(SCORES_DIR)/$$sf ; chmod 664 $(SCORES_DIR)/$$sf; chown :games $(SCORES_DIR)/$$sf ; done; - for sf in $(SCORE_FILES); do touch $(SCORES_DIR)/$$sf ; chmod 664 $(SCORES_DIR)/$$sf; chown :games $(SCORES_DIR)/$$sf ; done;
- for game in $(ALL); do chown :games $(GAMES_DIR)/$$game; chmod g $(GAMES_DIR)/$$game ; done; - for game in $(ALL); do chown :games $(GAMES_DIR)/$$game; chmod g $(GAMES_DIR)/$$game ; done;
+ for sf in $(SCORE_FILES); do touch $(DESTDIR)$(SCORES_DIR)/$$sf ; chmod 664 $(DESTDIR)$(SCORES_DIR)/$$sf; chown :games $(DESTDIR)$(SCORES_DIR)/$$sf ; done; + for sf in $(SCORE_FILES); do touch $(DESTDIR)$(SCORES_DIR)/$$sf ; chmod 664 $(DESTDIR)$(SCORES_DIR)/$$sf; chown :games $(DESTDIR)$(SCORES_DIR)/$$sf ; done;
+ for game in $(ALL); do chown :games $(DESTDIR)$(GAMES_DIR)/$$game; chmod g $(DESTDIR)$(GAMES_DIR)/$$game ; done; + for game in $(ALL); do chown :games $(DESTDIR)$(GAMES_DIR)/$$game; chmod g $(DESTDIR)$(GAMES_DIR)/$$game ; done;
manpages: manpages:
- cp man/* $(MAN_DIR) - cp man/* $(MAN_DIR)
-jewels: jewels.c config.h common.h -jewels: jewels.c config.h common.h
- $(CC) jewels.c $(LDFLAGS) $(CFLAGS) -o ./jewels - $(CC) jewels.c $(LDFLAGS) $(CFLAGS) -o ./jewels
-sudoku: sudoku.c config.h -sudoku: sudoku.c config.h
- $(CC) sudoku.c $(LDFLAGS) $(CFLAGS) -o ./sudoku - $(CC) sudoku.c $(LDFLAGS) $(CFLAGS) -o ./sudoku
-mines: mines.c config.h -mines: mines.c config.h
- $(CC) mines.c $(LDFLAGS) $(CFLAGS) -o ./mines - $(CC) mines.c $(LDFLAGS) $(CFLAGS) -o ./mines
@ -96,22 +94,22 @@ index 49cb8fd..1ad7867 100644
+ cp nbsdgames.desktop $(DESTIDR)$(PREFIX)/usr/share/applications + cp nbsdgames.desktop $(DESTIDR)$(PREFIX)/usr/share/applications
+ cp nbsdgames.svg $(DESTDIR)$(PREFIX)/usr/share/pixmaps + cp nbsdgames.svg $(DESTDIR)$(PREFIX)/usr/share/pixmaps
clean: clean:
for game in $(ALL); do rm $$game; done; for game in $(ALL); do rm $$game; done;
uninstall: uninstall:
for game in $(ALL); do rm $(GAMES_DIR)/$$game; rm $(MAN_DIR)/$$game.6.gz ;done; for game in $(ALL); do rm $(GAMES_DIR)/$$game; rm $(MAN_DIR)/$$game.6.gz ;done;
install: $(ALL) install: $(ALL)
- cp $(ALL) $(GAMES_DIR) - cp $(ALL) $(GAMES_DIR)
+ cp $(ALL) $(DESTDIR)/$(GAMES_DIR) + cp $(ALL) $(DESTDIR)/$(GAMES_DIR)
test: test:
for game in $(ALL); do ./$$game ;done; for game in $(ALL); do ./$$game ;done;
#######for namespacing ####### #######for namespacing #######
nb: nb:
- CFLAGS="$$CFLAGS -D NB=\\\"nb\\\"" make - CFLAGS="$$CFLAGS -D NB=\\\"nb\\\"" make
+ CFLAGS="$$CFLAGS -D NB=\\\"nb\\\"" $(MAKE) + CFLAGS="$$CFLAGS -D NB=\\\"nb\\\"" $(MAKE)
for game in $(ALL); do cp $$game nb$$game ;done; for game in $(ALL); do cp $$game nb$$game ;done;
for manpage in $(ls man); do cp man/$$manpage man/nb$$manpage ;done; for manpage in $(ls man); do cp man/$$manpage man/nb$$manpage ;done;
nbinstall: nb nbinstall: nb
- cp nb* $(GAMES_DIR) - cp nb* $(GAMES_DIR)
+ for game in $(ALL); do cp nb$$game $(DESTDIR)/$(GAMES_DIR) ;done; + for game in $(ALL); do cp nb$$game $(DESTDIR)/$(GAMES_DIR) ;done;
+ cp nbsdgames $(DESTDIR)/$(GAMES_DIR) + cp nbsdgames $(DESTDIR)/$(GAMES_DIR)
@ -123,4 +121,4 @@ index 49cb8fd..1ad7867 100644
+ cp man/nb* $(DESTDIR)/$(MAN_DIR) + cp man/nb* $(DESTDIR)/$(MAN_DIR)
+nbclean: clean +nbclean: clean
+ for game in $(ALL); do rm nb$$game ;done; + for game in $(ALL); do rm nb$$game ;done;
+ +