From 60d4ee77a1538ab82a88755913438e410dbcf7c6 Mon Sep 17 00:00:00 2001 From: Leonardo Taccari Date: Fri, 22 Feb 2019 14:54:47 +0100 Subject: [PATCH] tscrape-git: Sync with upstream share/doc changes and avoid SUBST-fu --- tscrape-git/Makefile | 14 +++----------- tscrape-git/PLIST | 6 +++--- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/tscrape-git/Makefile b/tscrape-git/Makefile index e3be6ebe3f..1137195538 100644 --- a/tscrape-git/Makefile +++ b/tscrape-git/Makefile @@ -15,17 +15,9 @@ WRKSRC= ${WRKDIR}/tscrape USE_LANGUAGES= c99 -# Adjust config.mk -SUBST_CLASSES+= makefile -SUBST_STAGE.makefile= pre-configure -SUBST_MESSAGE.makefile= Fixing config.mk -SUBST_FILES.makefile= config.mk -SUBST_SED.makefile= -e 's,/usr/local,${PREFIX},g' -SUBST_SED.makefile+= -e 's,man,${PKGMANDIR},g' -SUBST_SED.makefile+= -e 's/cc/${CC:Q}/' -SUBST_SED.makefile+= -e 's,^CFLAGS *= ,CFLAGS += ,' -SUBST_SED.makefile+= -e 's,^CPPFLAGS *= ,CPPFLAGS += ,' -SUBST_SED.makefile+= -e 's,^LDFLAGS *= ,LDFLAGS += ,' +MAKE_FLAGS+= PREFIX=${PREFIX:Q} +MAKE_FLAGS+= MANPREFIX=${PREFIX:Q}/${PKGMANDIR:Q} +MAKE_FLAGS+= CC=${CC:Q} .include "../../wip/mk/git-package.mk" .include "../../mk/bsd.pkg.mk" diff --git a/tscrape-git/PLIST b/tscrape-git/PLIST index 866032552c..d808e18947 100644 --- a/tscrape-git/PLIST +++ b/tscrape-git/PLIST @@ -4,6 +4,6 @@ bin/tscrape_html bin/tscrape_plain bin/tscrape_update man/man1/tscrape.1 -share/tscrape/README -share/tscrape/style.css -share/tscrape/tscraperc.example +share/doc/tscrape/README +share/doc/tscrape/style.css +share/doc/tscrape/tscraperc.example