MakefileとREADME.mdファイルの更新 + NetBSDは「/usr/pkg」→「/usr/local」 + スペルミスの修正

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.6.0
+* MakefileとREADME.mdファイルの更新
+* NetBSDは「/usr/pkg」→「/usr/local」
+* スペルミスの修正
+
 # 0.5.0
 * .desktopファイルの追加
 * CDNを回避する様に

Makefile

@@ -9,27 +9,22 @@ PREFIX=/usr/local
 
 .if ${UNAME_S} == "Linux"
 PREFIX=/usr
-.elif ${UNAME_S} == "NetBSD"
-PREFIX=/usr/pkg
 .endif
 
 CC=cc
 FILES=main.c
-CFLAGS=-Wall -Wextra -g -I${PREFIX}/include
+CFLAGS=-Wall -Wextra -g -I/usr/include -I/usr/local/include
 LIBS=-lSDL2 -lSDL2_image -lcurl
-LDFLAGS=-L${PREFIX}/lib
+LDFLAGS=-L/usr/lib -L/usr/local/lib
 MANPREFIX=${PREFIX}/share/man
 
 .if ${UNAME_S} == "OpenBSD"
 MANPREFIX=${PREFIX}/man
-LDFLAGS+=-L/usr/lib -L/usr/X11R6/lib
-CFLAGS+=-I/usr/include -I/usr/X11R6/include
-.elif ${UNAME_S} == "FreeBSD"
-LDFLAGS+=-L/usr/lib
-CFLAGS+=-I/usr/include
+LDFLAGS+=-L/usr/X11R6/lib
+CFLAGS+=-I/usr/X11R6/include
 .elif ${UNAME_S} == "NetBSD"
-LDFLAGS+=-L/usr/lib -L/usr/local/lib -L/usr/X11R7/lib
-CFLAGS+=-I/usr/include -I/usr/local/include -I/usr/X11R7/include
+LDFLAGS+=-L/usr/X11R7/lib -L/usr/pkg/lib
+CFLAGS+=-I/usr/X11R7/include -I/usr/pkg/include
 .endif
 
 all:

README.md

@@ -1,4 +1,4 @@
-# mivfx - minimarist image view for x
+# mivfx - minimalist image view for x
 ミニマリストな画像ビューアー
 
 # インストールする方法
@@ -20,34 +20,34 @@ doas make install
 ## NetBSD
 ```sh
 doas pkgin install SDL2-2.28.5 SDL2_image curl
-make PREFIX=/usr/pkg
-doas make install PREFIX=/usr/pkg
+make
+doas make install
 ```
 
 ## CRUX
 ```sh
-doas prt-get depinst libsdl2 sdl2_image curl
-make PREFIX=/usr
-doas make install PREFIX=/usr
+doas prt-get depinst libsdl2 sdl2_image curl bmake
+bmake
+doas bmake install
 ```
 
 ## Void Linux
 ```sh
-doas xbps-install -S SDL2 SDL2_image curl
-make PREFIX=/usr
-doas make install PREFIX=/usr
+doas xbps-install -S SDL2 SDL2_image curl bmake
+bmake
+doas bmake install
 ```
 
 ## Artix Linux
 ```sh
-doas pacman -S sdl2 sdl2_image curl
-make PREFIX=/usr
-doas make install PREFIX=/usr
+doas pacman -S sdl2 sdl2_image curl bmake
+bmake
+doas bmake install
 ```
 
 ## Devuan GNU/Linux
 ```sh
-doas apt install libsdl2-dev libsdl2-image-dev libcurl4
-make PREFIX=/usr
-doas make install PREFIX=/usr
+doas apt install libsdl2-dev libsdl2-image-dev libcurl4 bmake
+bmake
+doas bmake install
 ```

main.c

@@ -29,7 +29,7 @@ int drag = 0;
 float zoom = 1.0f;
 
 const char* sofname = "mivfx";
-const char* version = "0.5.0";
+const char* version = "0.6.0";
 
 bool dlfile(const char* url, const char* filename) {
   CURL* curl = curl_easy_init();

mivfx.1

@@ -1,6 +1,6 @@
 .TH MIVFX 1 VERSION
 .SH NAME
-mivfx - minimarist image view for x
+mivfx - minimalist image view for x
 .SH SYNOPSIS
 .B mivfx
 <\fI\,file or url\fR>