Thu Mar 26 12:46:58 2020 UTC ()
sl: Respect CC/CFLAGS/LDFLAGS/etc


(nia)
diff -r1.22 -r1.23 pkgsrc/games/sl/Makefile
diff -r1.7 -r1.8 pkgsrc/games/sl/distinfo
diff -r0 -r1.1 pkgsrc/games/sl/patches/patch-Makefile
cvs diff -r1.22 -r1.23 pkgsrc/games/sl/Makefile (expand / switch to unified diff)

--- pkgsrc/games/sl/Makefile 2017/01/03 22:13:11 1.22
+++ pkgsrc/games/sl/Makefile 2020/03/26 12:46:58 1.23
@@ -1,28 +1,31 @@ @@ -1,28 +1,31 @@
1# $NetBSD: Makefile,v 1.22 2017/01/03 22:13:11 roy Exp $ 1# $NetBSD: Makefile,v 1.23 2020/03/26 12:46:58 nia Exp $
2# 2#
3 3
4DISTNAME= sl-5.02 4DISTNAME= sl-5.02
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= games 6CATEGORIES= games
7MASTER_SITES= -https://github.com/mtoyoda/sl/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX} 7MASTER_SITES= -https://github.com/mtoyoda/sl/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}
8 8
9MAINTAINER= minoura@NetBSD.org 9MAINTAINER= minoura@NetBSD.org
10HOMEPAGE= http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/ 10HOMEPAGE= http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/
11COMMENT= Animated SL that runs across the terminal when you type `sl' 11COMMENT= Animated SL that runs across the terminal when you type `sl'
12 12
13FAKE_NCURSES= yes 13FAKE_NCURSES= yes
14 14
15DIST_SUBDIR= ${PKGNAME_NOREV} 15DIST_SUBDIR= ${PKGNAME_NOREV}
16BUILD_TARGET= sl 16BUILD_TARGET= sl
17 17
 18MAKE_FLAGS+= CC=${CC:Q}
 19MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
 20
18INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/ja_JP.EUC/man1 21INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/ja_JP.EUC/man1
19 22
20do-install: 23do-install:
21 ${INSTALL_PROGRAM} ${WRKSRC}/sl ${DESTDIR}${PREFIX}/bin/sl 24 ${INSTALL_PROGRAM} ${WRKSRC}/sl ${DESTDIR}${PREFIX}/bin/sl
22 ${INSTALL_MAN} ${WRKSRC}/sl.1 \ 25 ${INSTALL_MAN} ${WRKSRC}/sl.1 \
23 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 26 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
24 ${INSTALL_MAN} ${WRKSRC}/sl.1.ja \ 27 ${INSTALL_MAN} ${WRKSRC}/sl.1.ja \
25 ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/sl.1 28 ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/sl.1
26 29
27.include "../../mk/curses.buildlink3.mk" 30.include "../../mk/curses.buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/games/sl/distinfo (expand / switch to unified diff)

--- pkgsrc/games/sl/distinfo 2015/11/03 20:57:04 1.7
+++ pkgsrc/games/sl/distinfo 2020/03/26 12:46:58 1.8
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.7 2015/11/03 20:57:04 agc Exp $ 1$NetBSD: distinfo,v 1.8 2020/03/26 12:46:58 nia Exp $
2 2
3SHA1 (sl-5.02/sl-5.02.tar.gz) = 8ea1ed978ed6738d6c510eceb329cb43616afb91 3SHA1 (sl-5.02/sl-5.02.tar.gz) = 8ea1ed978ed6738d6c510eceb329cb43616afb91
4RMD160 (sl-5.02/sl-5.02.tar.gz) = f3643055900b8a71dc9c18d59b0815c554298875 4RMD160 (sl-5.02/sl-5.02.tar.gz) = f3643055900b8a71dc9c18d59b0815c554298875
5SHA512 (sl-5.02/sl-5.02.tar.gz) = a4d18bc79d7e0eca7748b10226a6b2a85a7a01d636e4e9215bf524a7849bc5cb250034326e5a69f7423d79e40b92182fddc0e56e25df616edae06369c782cb26 5SHA512 (sl-5.02/sl-5.02.tar.gz) = a4d18bc79d7e0eca7748b10226a6b2a85a7a01d636e4e9215bf524a7849bc5cb250034326e5a69f7423d79e40b92182fddc0e56e25df616edae06369c782cb26
6Size (sl-5.02/sl-5.02.tar.gz) = 5353 bytes 6Size (sl-5.02/sl-5.02.tar.gz) = 5353 bytes
 7SHA1 (patch-Makefile) = 4e82d8e3d7a514213d8d2bc806191975f13546d4
File Added: pkgsrc/games/sl/patches/patch-Makefile
$NetBSD: patch-Makefile,v 1.1 2020/03/26 12:46:58 nia Exp $

Respect LDFLAGS.

--- Makefile.orig	2014-06-16 07:27:59.000000000 +0000
+++ Makefile
@@ -9,5 +9,8 @@
 CC=gcc
 CFLAGS=-O
 
-sl: sl.c sl.h
-	$(CC) $(CFLAGS) -o sl sl.c -lncurses
+sl.o: sl.c sl.h
+	$(CC) $(CFLAGS) -c sl.c
+
+sl: sl.o
+	$(CC) $(LDFLAGS) -o sl sl.o -lncurses