updates for fslsfonts 1.0.5, fstobdf 1.0.6, ico 1.0.4, luit 1.1.1 and

rgb 1.0.6.
This commit is contained in:
mrg 2015-07-22 07:58:00 +00:00
parent 816dc0e3d6
commit 1d694e8a5a
6 changed files with 19 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2013/05/31 05:24:49 mrg Exp $
# $NetBSD: Makefile,v 1.3 2015/07/22 07:58:00 mrg Exp $
.include <bsd.own.mk>
@ -10,5 +10,7 @@ DPADD+= ${LIBFS}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
.include "../../xorg-pkg-ver.mk"
.include <bsd.x11.mk>
.include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2013/05/31 05:24:49 mrg Exp $
# $NetBSD: Makefile,v 1.3 2015/07/22 07:58:00 mrg Exp $
.include <bsd.own.mk>
@ -11,5 +11,7 @@ DPADD+= ${LIBFS} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
.include "../../xorg-pkg-ver.mk"
.include <bsd.x11.mk>
.include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
# $NetBSD: Makefile,v 1.2 2015/07/22 07:58:00 mrg Exp $
.include <bsd.own.mk>
@ -10,6 +10,7 @@ LDADD+= -lXext -lX11 -lpthread -lm
DPADD+= ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
.include <bsd.x11.mk>
.include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2011/10/10 09:41:47 njoly Exp $
# $NetBSD: Makefile,v 1.5 2015/07/22 07:58:00 mrg Exp $
.include <bsd.own.mk>
@ -6,7 +6,10 @@ PROG= luit
SRCS= luit.c iso2022.c charset.c parser.c sys.c other.c
CPPFLAGS+=-DLOCALE_ALIAS_FILE=\"${X11LIBDIR}/locale/locale.alias\"
CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
#CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
CPPFLAGS+=-DHAVE_PUTENV -DHAVE_WORKING_POLL -DHAVE_POLL_H
CPPFLAGS+=-DHAVE_SYS_PARAM -DHAVE_OPENPTY -DHAVE_GRANTPT
CPPFLAGS+=-DHAVE_POSIX_OPENPT -DHAVE_STRDUP
X11EXTRAMANDEFS+= -e 's,__locale_alias__,${X11LIBDIR}/locale/locale.alias,g'
@ -15,5 +18,7 @@ DPADD+= ${LIBFONTENC} ${LIBZ}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
.include "../../xorg-pkg-ver.mk"
.include <bsd.x11.mk>
.include <bsd.prog.mk>

View File

@ -1,10 +1,11 @@
# $NetBSD: Makefile,v 1.4 2014/08/24 18:27:16 apb Exp $
# $NetBSD: Makefile,v 1.5 2015/07/22 07:58:00 mrg Exp $
.include <bsd.own.mk>
PROG= showrgb
CPPFLAGS+=-DNDBM -DRGB_DB=\"${X11LIBDIR}/rgb\" -DUSE_RGB_TXT
CPPFLAGS+=-DHAVE_ASPRINTF
CPPFLAGS+=-I${X11SRCDIR.rgb}/include
X11EXTRAMANDEFS+= -e 's,__RGB_DB__,${X11LIBDIR}/rgb,g' \

View File

@ -1,4 +1,4 @@
# $NetBSD: xorg-pkg-ver.mk,v 1.4 2015/07/20 23:50:22 mrg Exp $
# $NetBSD: xorg-pkg-ver.mk,v 1.5 2015/07/22 07:58:00 mrg Exp $
# when including this make sure PROG is set so that $X11SRCDIR.$PROG
# is a valid setting. set XORG_PKG_VER_PROG if PROG is wrong.
@ -19,6 +19,7 @@ XORG_PKG_PACKAGE_VERSION!= \
}' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
.if !empty(XORG_PKG_PACKAGE_VERSION)
CPPFLAGS+= -DPACKAGE_VERSION=\"${XORG_PKG_PACKAGE_VERSION:Q}\"
CPPFLAGS+= -DVERSION=\"${XORG_PKG_PACKAGE_VERSION:Q}\"
.endif
XORG_PKG_PACKAGE_STRING!= \