diff --git a/Makefile.netbsd b/Makefile.netbsd index 2e56955..f507b90 100644 --- a/Makefile.netbsd +++ b/Makefile.netbsd @@ -34,7 +34,7 @@ OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o $(CC) -c -o $@ $< $(CFLAGS) magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} - $(CC) -o magicka -o $@ $^ $(CFLAGS) -L/usr/pkg/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv + $(CC) -o magicka -o $@ $^ $(CFLAGS) -R/usr/pkg/lib -L/usr/pkg/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv magiedit: $(ODOORS) cd utils/magiedit && $(MAKE) @@ -72,4 +72,4 @@ clean: cd utils/magichat && $(MAKE) clean cd deps/cdk-5.0-20161210 && $(MAKE) clean cd utils/fileapprove && $(MAKE) clean - cd utils/magiftpd && $(MAKE) clean \ No newline at end of file + cd utils/magiftpd && $(MAKE) clean diff --git a/Makefile.netbsd.WWW b/Makefile.netbsd.WWW index 50ddd12..dcb25f0 100644 --- a/Makefile.netbsd.WWW +++ b/Makefile.netbsd.WWW @@ -39,7 +39,7 @@ OBJ = deps/aha/aha.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o do $(CC) -c -o $@ $< $(CFLAGS) magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} ${JSMN} - $(CC) -o magicka -o $@ $^ $(CFLAGS) -L/usr/pkg/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv $(MICROHTTPD) + $(CC) -o magicka -o $@ $^ $(CFLAGS) -R/usr/pkg/lib -L/usr/pkg/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv $(MICROHTTPD) magiedit: $(ODOORS) cd utils/magiedit && $(MAKE) @@ -78,4 +78,4 @@ clean: cd utils/magichat && $(MAKE) clean cd deps/cdk-5.0-20161210 && $(MAKE) clean cd utils/fileapprove && $(MAKE) clean - cd utils/magiftpd && $(MAKE) clean \ No newline at end of file + cd utils/magiftpd && $(MAKE) clean diff --git a/README.md b/README.md index b4efe86..28edd34 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Linux/FreeBSD bulletin board system (Should also work on NetBSD and Mac OS X, if As I lost the code to my initial BBS flea, I've decided to start over from scratch and this time I'm using git hub so I dont lose it again! -Magicka is meant to be a modern (haha) BBS system, using modern technologies, like Sqlite3, IRC, long filenames (gasp!) etc +Magicka is meant to be a modern (haha) BBS system, using modern technologies, like Sqlite3, long filenames (gasp!) etc while still retaining the classic BBS feel. ANSI & Telnet, and good old ZModem. If you want to install Magicka BBS, follow these steps. @@ -76,3 +76,10 @@ or `make -f Makefile.freebsd.WWW` be sure to do this from a clean source tree. The webserver will use templates in the www/ folder to create internal webpages on the fly, anything in www/static/ is served up as is. +# Misc Notes: + +* FreeBSD requires libiconv to be installed from ports in addition to other dependencies. It also requires `ipv6_ipv4mapping="YES"` to be set in rc.conf + +* macOS makefiles are intended to be built with dependencies provided by macports, homebrew support will require significant changes. + +* NetBSD requires libiconv to be installed from pkgsrc in addition to other dependencies. It also requires `net.inet6.ip6.v6only=0` to be set in sysctl.conf diff --git a/utils/fileapprove/Makefile b/utils/fileapprove/Makefile index 0662e2d..8ddeba7 100644 --- a/utils/fileapprove/Makefile +++ b/utils/fileapprove/Makefile @@ -8,7 +8,7 @@ endif ifeq ($(OS), NetBSD) CC=cc CFLAGS=-I/usr/pkg/include - LDFLAGS=-L/usr/pkg/lib + LDFLAGS=-R/usr/pkg/lib -L/usr/pkg/lib endif ifeq ($(OS), Linux) CC=gcc diff --git a/utils/magiftpd/Makefile b/utils/magiftpd/Makefile index 454cd0d..7af391d 100644 --- a/utils/magiftpd/Makefile +++ b/utils/magiftpd/Makefile @@ -8,7 +8,7 @@ endif ifeq ($(OS), NetBSD) CC=cc CFLAGS=-I/usr/pkg/include - LDFLAGS=-L/usr/pkg/lib + LDFLAGS=-R/usr/pkg/lib -L/usr/pkg/lib endif ifeq ($(OS), Linux) CC=gcc diff --git a/utils/ticproc/Makefile b/utils/ticproc/Makefile index 17d2839..b5492ff 100644 --- a/utils/ticproc/Makefile +++ b/utils/ticproc/Makefile @@ -8,7 +8,7 @@ endif ifeq ($(OS), NetBSD) CC=cc CFLAGS=-I/usr/pkg/include - LDFLAGS=-L/usr/pkg/lib + LDFLAGS=-R/usr/pkg/lib -L/usr/pkg/lib endif ifeq ($(OS), Linux) CC=gcc