diff options
| author | leot <leot@pkgsrc.org> | 2016-02-18 18:52:54 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2016-02-18 18:52:54 +0000 |
| commit | 0e6262750e6625d234d11c95e025cec98d4ad325 (patch) | |
| tree | 4eef33b0150b2f9a1726c4302b92f6c47398ae27 /x11 | |
| parent | 0e36299f42311152e48492b3e85197943f77e976 (diff) | |
| download | pkgsrc-0e6262750e6625d234d11c95e025cec98d4ad325.tar.gz | |
Various minor fixes.
o slock also needs x11/libXinerama
o Bump _XOPEN_SOURCE version to 600 in order to avoid build issues on SunOS.
o While here also fix some cosmetical issues providing a better SUBST_MESSAGE
for "makefile" class and also accept possible user-defined CPPFLAGS.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/slock/Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/x11/slock/Makefile b/x11/slock/Makefile index ccf14b5f614..fccb85985c3 100644 --- a/x11/slock/Makefile +++ b/x11/slock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2016/02/16 17:47:19 leot Exp $ +# $NetBSD: Makefile,v 1.9 2016/02/18 18:52:54 leot Exp $ DISTNAME= slock-1.3 CATEGORIES= x11 @@ -11,19 +11,27 @@ LICENSE= mit MAKE_JOBS_SAFE= no -# Adjust config.mk SUBST_CLASSES+= makefile SUBST_STAGE.makefile= pre-configure -SUBST_MESSAGE.makefile= Fixing config.mk +SUBST_MESSAGE.makefile= Adjust config.mk SUBST_FILES.makefile= config.mk SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g' SUBST_SED.makefile+= -e 's,share/man,${PKGMANDIR},g' SUBST_SED.makefile+= -e 's,/usr/X11R6,${X11BASE},' SUBST_SED.makefile+= -e '/^CPPFLAGS/ s,-DHAVE_SHADOW_H,,' SUBST_SED.makefile+= -e 's,^CFLAGS *= ,CFLAGS += ,' +SUBST_SED.makefile+= -e 's,^CPPFLAGS *= ,CPPFLAGS += ,' SUBST_SED.makefile+= -e 's,^LDFLAGS *= ,LDFLAGS += ,' SUBST_SED.makefile+= -e 's/cc/${CC:Q}/' +# Bump _XOPEN_SOURCE version to 600 in order to avoid "Compiler or options +# invalid for pre-UNIX 03 X/Open applications" error on SunOS. +SUBST_CLASSES+= slock +SUBST_STAGE.slock= pre-configure +SUBST_MESSAGE.slock= Bump _XOPEN_SOURCE version +SUBST_FILES.slock= slock.c +SUBST_SED.slock+= -e '/_XOPEN_SOURCE/ s/500/600/' + INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/bsd.prefs.mk" @@ -41,4 +49,5 @@ SPECIAL_PERMS+= bin/slock ${SETUID_ROOT_PERMS} .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |