diff options
author | ng0 <ng0@pkgsrc.org> | 2019-11-26 18:32:29 +0000 |
---|---|---|
committer | ng0 <ng0@pkgsrc.org> | 2019-11-26 18:32:29 +0000 |
commit | babaac3025aa01810827ee5abaf314ff734234c3 (patch) | |
tree | 4523ff5cff477b3b61a4e6672900cdbe652ff8aa /www/nsm | |
parent | 23b745bb809d9374531ec268f4ee2f43f1719c9c (diff) | |
download | pkgsrc-babaac3025aa01810827ee5abaf314ff734234c3.tar.gz |
www/nsm: Update to 1.20
Changelog picked from https://github.com/nifty-site-manager/nsm/releases:
Nift (aka nsm) v1.20
Release Notes:
made template language available with input parameters
added paginfo syntax @pagename, @pagepath, @contentpath, @templatepath to template language
added siteinfo syntax @contentdir, @sitedir, @contentext, @pageext, @defaulttemplate to template language
fixed indenting bugs
fixed os_mtx functionality
added optional sleepTime parameter for Nift serve command
Nift (aka nsm) v1.19
Release Notes:
added more error handling
added string variables
added rootBranch and siteBranch to config files
changed/improved/finalised how pre/post build/serve scripts are done
fixed @script[output] and @System[output/content]
added pre/post build-[all/updated] script support
Nift (aka nsm) v1.18
Release Notes:
added FileSystem.[h/cpp] to the project
added cpDir function to FileSystem.[h/cpp]
renamed trash to ret_val and handle more errors
fixed numerous minor bugs
Nift (aka nsm) v1.17
Release Notes:
changed std::endl to "\n" when writing to file, 20% improvement in build-all time on some machines, no improvement on others
changed pages set to pointer in PageBuilder.h, significantly less memory consumption
added/improved Nift commands new-template, new-site-dir, new-cont-dir, new-cont-ext, new-page-ext
added @systemcontent(sys-call) syntax to template language
fixed bug with @System, @systemoutput, @script, @scriptoutput syntax
Nift (aka nsm) v1.16
Release Notes:
improved multithreading
added @inputhead syntax to the template language
fixed read_sys_call and read_path
improved new-page-ext
Nift (aka nsm) v1.15
Release Notes:
added non-default page extension support
added @dep syntax to the template language
Diffstat (limited to 'www/nsm')
-rw-r--r-- | www/nsm/Makefile | 4 | ||||
-rw-r--r-- | www/nsm/distinfo | 11 | ||||
-rw-r--r-- | www/nsm/patches/patch-Makefile | 143 |
3 files changed, 7 insertions, 151 deletions
diff --git a/www/nsm/Makefile b/www/nsm/Makefile index 95bb28f5068..145cab874d5 100644 --- a/www/nsm/Makefile +++ b/www/nsm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2019/10/22 10:34:34 ng0 Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/26 18:32:29 ng0 Exp $ -DISTNAME= nsm-1.15 +DISTNAME= nsm-1.20 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_GITHUB:=nifty-site-manager/} GITHUB_TAG= v${PKGVERSION_NOREV} diff --git a/www/nsm/distinfo b/www/nsm/distinfo index 785d070b638..d5602f90d11 100644 --- a/www/nsm/distinfo +++ b/www/nsm/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.1 2019/10/22 10:34:34 ng0 Exp $ +$NetBSD: distinfo,v 1.2 2019/11/26 18:32:29 ng0 Exp $ -SHA1 (nsm-1.15.tar.gz) = 8122a8faba3be0f74277ffe9b2c646e1a1858da9 -RMD160 (nsm-1.15.tar.gz) = e7988ea76ce0cccfdd45f18be0f3506fe7e2644a -SHA512 (nsm-1.15.tar.gz) = cbd8d0f791f5715b1995bc06baa41c4e79fef4feaf38df2c8735021fe20b8c410d127bcb4b01caf97039e686bb451ecb0f326ed8de3ca954c37c29207c4ab023 -Size (nsm-1.15.tar.gz) = 96116 bytes -SHA1 (patch-Makefile) = d38e46954af1630dc603e2d135e02884c50c2b27 +SHA1 (nsm-1.20.tar.gz) = 80988b78c96ff44521c280f808a563f9d3603732 +RMD160 (nsm-1.20.tar.gz) = fba7c59414550658ca2444a8056688af971e6b72 +SHA512 (nsm-1.20.tar.gz) = 0964b920dde598795dde7f3fe96480b27c73e66f5fc0d9a73603c231b6a56e3676b4de33b92a0862833f3af26c12bdca8f79dee3f852397e12c4e9cb03ffc29b +Size (nsm-1.20.tar.gz) = 34184 bytes diff --git a/www/nsm/patches/patch-Makefile b/www/nsm/patches/patch-Makefile deleted file mode 100644 index 1f4337ecafd..00000000000 --- a/www/nsm/patches/patch-Makefile +++ /dev/null @@ -1,143 +0,0 @@ -$NetBSD: patch-Makefile,v 1.1 2019/10/22 10:34:34 ng0 Exp $ - -From 9137389f1efdec3502f81b0d7f39a233173a639d upstream -Makefile: Use ${CXX} instead of g++ - - ---- Makefile~ -+++ Makefile -@@ -1,7 +1,7 @@ - #basic makefile for nsm - objects=nsm.o DateTimeInfo.o Directory.o Filename.o PageBuilder.o PageInfo.o Path.o Quoted.o SiteInfo.o Title.o - cppfiles=nsm.cpp DateTimeInfo.cpp Directory.cpp Filename.cpp PageBuilder.cpp PageInfo.cpp Path.cpp Quoted.cpp SiteInfo.cpp Title.cpp --CC=g++ -+CC=${CXX} - LINK=-pthread - CXXFLAGS=-std=c++11 -Wall -Wextra -pedantic -O3 - #Flags to use when compiling for Chocolatey - - - -From d9ff260d813c9d8057d9e6572c3735f64f99b174 upstream -Add PREFIX + DESTDIR support, add install + uninstall target. - - ---- Makefile~ -+++ Makefile -@@ -3,9 +3,14 @@ objects=nsm.o DateTimeInfo.o Directory.o Filename.o PageBuilder.o PageInfo.o Pat - cppfiles=nsm.cpp DateTimeInfo.cpp Directory.cpp Filename.cpp PageBuilder.cpp PageInfo.cpp Path.cpp Quoted.cpp SiteInfo.cpp Title.cpp - CC=${CXX} - LINK=-pthread --CXXFLAGS=-std=c++11 -Wall -Wextra -pedantic -O3 -+CXXFLAGS+= -std=c++11 -Wall -Wextra -pedantic -O3 - #Flags to use when compiling for Chocolatey - #CXXFLAGS=-std=c++11 -Wall -Wextra -pedantic -O3 -static -static-libgcc -static-libstdc++ -+DESTDIR?= -+PREFIX?=/usr/local -+BINDIR=${DESTDIR}${PREFIX}/bin -+ -+all: nsm - - nsm: $(objects) - $(CC) $(CXXFLAGS) $(cppfiles) -o nsm $(LINK) -@@ -45,23 +50,15 @@ linux-gedit-highlighting: - chmod 644 html.lang - cp html.lang /usr/share/gtksourceview-3.0/language-specs/html.lang - --linux-install: -- chmod 755 nsm -- mv nift /usr/local/bin -- mv nsm /usr/local/bin -- --linux-uninstall: -- rm /usr/local/bin/nift -- rm /usr/local/bin/nsm -- --osx-install: -+install: -+ mkdir -p ${BINDIR} - chmod 755 nsm -- mv nift /usr/local/bin -- mv nsm /usr/local/bin -+ mv nift ${BINDIR} -+ mv nsm ${BINDIR} - --osx-uninstall: -- rm /usr/local/bin/nift -- rm /usr/local/bin/nsm -+uninstall: -+ rm ${BINDIR}/nift -+ rm ${BINDIR}/nsm - - git-bash-install: - chmod 755 nsm - - - -From 467ac9c372fe2aabe8513ab4d5b34de6b050174f upstream -Use CXX for C++ compiler, use conditional assignment operator - for CXX. - - ---- Makefile~ -+++ Makefile -@@ -1,7 +1,7 @@ - #basic makefile for nsm - objects=nsm.o DateTimeInfo.o Directory.o Filename.o PageBuilder.o PageInfo.o Path.o Quoted.o SiteInfo.o Title.o - cppfiles=nsm.cpp DateTimeInfo.cpp Directory.cpp Filename.cpp PageBuilder.cpp PageInfo.cpp Path.cpp Quoted.cpp SiteInfo.cpp Title.cpp --CC=${CXX} -+CXX?=g++ - LINK=-pthread - CXXFLAGS+= -std=c++11 -Wall -Wextra -pedantic -O3 - #Flags to use when compiling for Chocolatey -@@ -13,38 +13,38 @@ BINDIR=${DESTDIR}${PREFIX}/bin - all: nsm - - nsm: $(objects) -- $(CC) $(CXXFLAGS) $(cppfiles) -o nsm $(LINK) -- $(CC) $(CXXFLAGS) $(cppfiles) -o nift $(LINK) -+ $(CXX) $(CXXFLAGS) $(cppfiles) -o nsm $(LINK) -+ $(CXX) $(CXXFLAGS) $(cppfiles) -o nift $(LINK) - - nsm.o: nsm.cpp SiteInfo.o Timer.h -- $(CC) $(CXXFLAGS) -c -o $@ $< $(LINK) -+ $(CXX) $(CXXFLAGS) -c -o $@ $< $(LINK) - - SiteInfo.o: SiteInfo.cpp SiteInfo.h PageBuilder.o -- $(CC) $(CXXFLAGS) -c -o $@ $< $(LINK) -+ $(CXX) $(CXXFLAGS) -c -o $@ $< $(LINK) - - PageBuilder.o: PageBuilder.cpp PageBuilder.h DateTimeInfo.o PageInfo.o -- $(CC) $(CXXFLAGS) -c -o $@ $< -+ $(CXX) $(CXXFLAGS) -c -o $@ $< - - DateTimeInfo.o: DateTimeInfo.cpp DateTimeInfo.h -- $(CC) $(CXXFLAGS) -c -o $@ $< -+ $(CXX) $(CXXFLAGS) -c -o $@ $< - - PageInfo.o: PageInfo.cpp PageInfo.h Path.o Title.o -- $(CC) $(CXXFLAGS) -c -o $@ $< -+ $(CXX) $(CXXFLAGS) -c -o $@ $< - - Path.o: Path.cpp Path.h Directory.o Filename.o -- $(CC) $(CXXFLAGS) -c -o $@ $< -+ $(CXX) $(CXXFLAGS) -c -o $@ $< - - Directory.o: Directory.cpp Directory.h Quoted.h -- $(CC) $(CXXFLAGS) -c -o $@ $< -+ $(CXX) $(CXXFLAGS) -c -o $@ $< - - Filename.o: Filename.cpp Filename.h Quoted.h -- $(CC) $(CXXFLAGS) -c -o $@ $< -+ $(CXX) $(CXXFLAGS) -c -o $@ $< - - Title.o: Title.cpp Title.h Quoted.o -- $(CC) $(CXXFLAGS) -c -o $@ $< -+ $(CXX) $(CXXFLAGS) -c -o $@ $< - - Quoted.o: Quoted.cpp Quoted.h -- $(CC) $(CXXFLAGS) -c -o $@ $< -+ $(CXX) $(CXXFLAGS) -c -o $@ $< - - linux-gedit-highlighting: - chmod 644 html.lang |