- Update to 20130906 snapshot [1]
- Use options helpers - Remove NLS knob, now it's runtime option PR: ports/165913 (based on) [1] Submitted by: Conrad J. Sabatier <conrads@cox.net> [1]
This commit is contained in:
Alex Kozlov
parent
3cdbdc0595
commit
73420e1dd5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=335974
4 changed files with 21 additions and 116 deletions
|
|
@ -2,39 +2,39 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= vtwm
|
||||
PORTVERSION= 5.4.7
|
||||
PORTREVISION= 4
|
||||
PORTVERSION= 5.4.99.20130906
|
||||
CATEGORIES= x11-wm
|
||||
MASTER_SITES= SF http://www.vtwm.org/downloads/
|
||||
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
|
||||
PROJECTHOST= ak-various-projects
|
||||
|
||||
MAINTAINER= ak@FreeBSD.org
|
||||
COMMENT= Twm with a virtual desktop and optional Motif-like features
|
||||
|
||||
LICENSE= MIT
|
||||
|
||||
USE_XORG= x11 xext xpm xmu
|
||||
MAKEFILE= ${FILESDIR}/Makefile.bsd
|
||||
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
|
||||
|
||||
ETCDIR?= ${PREFIX}/etc
|
||||
USE_XZ= yes
|
||||
|
||||
USES= pkgconfig
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_XORG= x11 xext xft xinerama xpm xmu xrandr
|
||||
|
||||
WRKSRC= ${WRKDIR}/vtwm-20130906
|
||||
|
||||
PLIST_FILES= bin/vtwm \
|
||||
bin/nexpm \
|
||||
etc/system.vtwmrc \
|
||||
man/man1/vtwm.1.gz
|
||||
|
||||
OPTIONS_DEFINE= SOUND NLS
|
||||
OPTIONS_DEFAULT= SOUND NLS
|
||||
OPTIONS_DEFINE= SOUND
|
||||
SOUND_DESC= Sound support (via rplay)
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
SOUND_CONFIGURE_ENABLE= sound
|
||||
SOUND_LIB_DEPENDS= librplay.so:${PORTSDIR}/audio/rplay
|
||||
|
||||
.if ${PORT_OPTIONS:MSOUND}
|
||||
LIB_DEPENDS+= librplay.so:${PORTSDIR}/audio/rplay
|
||||
MAKE_ENV+= SOUND=yes
|
||||
.else
|
||||
MAKE_ENV+= SOUND=no
|
||||
.endif
|
||||
|
||||
.if ! ${PORT_OPTIONS:MNLS}
|
||||
CFLAGS+= -DNO_I18N_SUPPORT
|
||||
.endif
|
||||
pre-patch:
|
||||
@${REINPLACE_CMD} -e 's|\$${datadir}/X11/vtwm|\$${prefix}/etc|' ${WRKSRC}/Makefile.in
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (vtwm-5.4.7.tar.gz) = c62f692c42420666920a23cd489633e91789b379fed13561321b44d9ffa8c9e9
|
||||
SIZE (vtwm-5.4.7.tar.gz) = 1021160
|
||||
SHA256 (vtwm-5.4.99.20130906.tar.xz) = 90a9edc39bc5b43ae22d1eb3dfaf8890ad501fe79be5aabb8bb5476e4cfe08d9
|
||||
SIZE (vtwm-5.4.99.20130906.tar.xz) = 963540
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
PREFIX?= /usr/local
|
||||
BINDIR?= $(PREFIX)/bin
|
||||
ETCDIR?= $(PREFIX)/etc
|
||||
MANDIR?= $(PREFIX)/man/man
|
||||
|
||||
NO_MANCOMPRESS?= yes
|
||||
MAN1= vtwm.1
|
||||
|
||||
SOUND?= yes
|
||||
|
||||
LN= ln -f
|
||||
LFLAGS+= -l
|
||||
|
||||
# For the traditional look of TWM as the system fallback,
|
||||
# change this to "2D"
|
||||
SYS_VTWMRC_LOOK = 3D
|
||||
|
||||
CONFDEFINES= '-DSYSTEM_VTWMRC="'$(ETCDIR)'/system.vtwmrc"' \
|
||||
'-DSYSTEM_TWMRC="'$(ETCDIR)'/system.twmrc"'
|
||||
CFLAGS+= -I/usr/local/include $(CONFDEFINES)
|
||||
LDADD+= -L/usr/local/lib -ll -lX11 -lXext -lXpm -lXmu
|
||||
|
||||
.if ${SOUND} == "yes"
|
||||
LDADD+= -lrplay
|
||||
.else
|
||||
CFLAGS+= -DNO_SOUND_SUPPORT
|
||||
.endif
|
||||
|
||||
PROG= vtwm
|
||||
|
||||
SRCS= gram.y gram.h lex.l deftwmrc.c add_window.c gc.c list.c twm.c sound.c \
|
||||
parse.c menus.c events.c resize.c util.c version.c iconmgr.c \
|
||||
cursor.c regions.c applets.c icons.c desktop.c doors.c lastmake.c
|
||||
|
||||
FILES= system.vtwmrc
|
||||
FILESDIR= $(ETCDIR)
|
||||
FILESMODE= 644
|
||||
|
||||
deftwmrc.c: system.vtwmrc
|
||||
echo '/* ' >$@
|
||||
echo ' * This file is generated automatically from the default' >>$@
|
||||
echo ' * VTWM bindings file system.vtwmrc.'$(SYS_VTWMRC_LOOK)' by the VTWM Makefile.' >>$@
|
||||
echo ' */' >>$@
|
||||
echo '' >>$@
|
||||
echo 'char *defTwmrc[] = {' >>deftwmrc.c
|
||||
sed -e '/^$$/d' -e '/^#/d' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/",/' -e 's/[ ]\{1,\}/ /g' -e 's/^" /"/' system.vtwmrc >>$@
|
||||
echo '(char *)0 };' >>$@
|
||||
|
||||
lastmake.c:
|
||||
echo '/* ' >$@
|
||||
echo ' * This file is generated automatically by the VTWM Makefile.' >>$@
|
||||
echo ' */' >>$@
|
||||
echo '' >>$@
|
||||
echo 'char *lastmake[] = {' >>lastmake.c
|
||||
echo ' "Platform: '`uname -r -s`'",' >>$@
|
||||
echo ' "Build: '`date`'",' >>$@
|
||||
echo ' "" };' >>$@
|
||||
|
||||
$(MAN1):
|
||||
$(LN) doc/vtwm.man $@
|
||||
|
||||
system.vtwmrc:
|
||||
$(LN) $@.$(SYS_VTWMRC_LOOK) $@
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
Index: util.c
|
||||
@@ -1211,7 +1211,7 @@
|
||||
if (!font->name)
|
||||
font->name = Scr->DefaultFont.name;
|
||||
if ((basename2 = (char *)malloc(strlen(font->name) + 3)))
|
||||
- sprintf(basename2, "%s,*", font->name);
|
||||
+ sprintf(basename2, "%s*", font->name);
|
||||
else
|
||||
basename2 = font->name;
|
||||
if ((font->fontset = XCreateFontSet(dpy, basename2,
|
||||
@@ -1223,7 +1223,7 @@
|
||||
|
||||
if ((basename3 = (char *)realloc(basename2,
|
||||
strlen(Scr->DefaultFont.name) + 3)))
|
||||
- sprintf(basename3, "%s,*", Scr->DefaultFont.name);
|
||||
+ sprintf(basename3, "%s*", Scr->DefaultFont.name);
|
||||
else
|
||||
{
|
||||
basename3 = Scr->DefaultFont.name;
|
||||
@@ -1249,8 +1249,8 @@
|
||||
free(basename2);
|
||||
|
||||
for (i = 0; i < missing_charset_count_return; i++)
|
||||
- fprintf(stderr, "%s: font for charset %s is lacking\n",
|
||||
- ProgramName, missing_charset_list_return[i]);
|
||||
+ fprintf(stderr, "%s: font(%s) for charset %s is lacking\n",
|
||||
+ ProgramName, font->name, missing_charset_list_return[i]);
|
||||
|
||||
font_extents = XExtentsOfFontSet(font->fontset);
|
||||
fnum = XFontsOfFontSet(font->fontset, &xfonts, &font_names);
|
||||
Loading…
Reference in a new issue