pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pinentry-dmenu: Fix install



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Oct 27 03:38:15 2020 +0100
Changeset:	3f344a185f58037b3847d41a526ac8c1dabab934

Modified Files:
	pinentry-dmenu/Makefile

Log Message:
pinentry-dmenu: Fix install

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3f344a185f58037b3847d41a526ac8c1dabab934

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pinentry-dmenu/Makefile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diffs:
diff --git a/pinentry-dmenu/Makefile b/pinentry-dmenu/Makefile
index ef4be7c3fb..3b3fe4abfd 100644
--- a/pinentry-dmenu/Makefile
+++ b/pinentry-dmenu/Makefile
@@ -11,15 +11,17 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	pkg-config
 
-PKG_VERSION=	\"0.1\"
-PKG_BUGREPORT=	\"https:\/\/github.com\/ritze\/pinentry-dmenu\"
+# Rewrite the config.mk rules.
+PKG_VERSION=	${TOOLS_PATH.make} -f ${WRKSRC}/config.mk -V VERSION
+PKG_BUGREPORT=	${TOOLS_PATH.make} -f ${WRKSRC}/config.mk -V BUGREPORT
+PKG_DEPS=	x11 xinerama freetype2 xft gpgme libconfig libassuan
 
-C_FLAGS=	`pkg-config --cflags x11 xinerama freetype2` \
+C_FLAGS=	`${TOOLS_PATH.pkg-config} --cflags ${PKG_DEPS}` \
 		-D_NETBSD_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L \
-		-DVERSION=${PKG_VERSION} \
-		-DPACKAGE_VERSION=${PKG_VERSION} \
-		-DPACKAGE_BUGREPORT=${PKG_BUGREPORT}
-LD_FLAGS=	`pkg-config --libs x11 xinerama freetype2 xft`
+		-DVERSION=\"${PKG_VERSION:sh}\" \
+		-DPACKAGE_VERSION=\"${PKG_VERSION:sh}\" \
+		-DPACKAGE_BUGREPORT=\"${PKG_BUGREPORT:sh}\"
+LD_FLAGS=	`${TOOLS_PATH.pkg-config} --libs ${PKG_DEPS}`
 
 MAKE_FLAGS+=	PREFIX=${PREFIX}
 MAKE_FLAGS+=	MANPREFIX=${PREFIX}/${PKGMANDIR}


Home | Main Index | Thread Index | Old Index