cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to st-0.4.

Browse Source 
ok jung@ (MAINTAINER)
This commit is contained in:
bentley 2013-04-19 19:54:34 +00:00
parent 2ebb722a86
commit bcd958a614
5 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x11/st/Makefile
View File

@ -1,29 +1,26 @@
# $OpenBSD: Makefile,v 1.7 2013/03/11 11:46:15 espie Exp $ # $OpenBSD: Makefile,v 1.8 2013/04/19 19:54:34 bentley Exp $
COMMENT= simple X terminal COMMENT= simple X terminal
DISTNAME= 0.3 DISTNAME= st-0.4
PKGNAME= st-${DISTNAME}
DIST_SUBDIR= st
CATEGORIES= x11 CATEGORIES= x11
HOMEPAGE= http://st.suckless.org/ HOMEPAGE= http://st.suckless.org/
MAINTAINER= Joerg Zinke <zinke@openbsd.org> MAINTAINER= Joerg Jung <jung@openbsd.org>
# MIT/X Consortium License # MIT/X Consortium License
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c util X11 Xext Xft fontconfig WANTLIB= c util X11 Xext Xft fontconfig freetype z
MASTER_SITES= http://hg.suckless.org/st/archive/ MASTER_SITES= http://dl.suckless.org/st/
RUN_DEPENDS= fonts/liberation-fonts RUN_DEPENDS= fonts/liberation-fonts
MAKE_ENV= LDFLAGS="${LDFLAGS}" MAKE_ENV= LDFLAGS="${LDFLAGS}"
FAKE_FLAGS= DESTDIR="" FAKE_FLAGS= DESTDIR=""
WRKDIST= ${WRKDIR}/st-${DISTNAME}
NO_TEST= Yes NO_TEST= Yes

4
x11/st/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (st/0.3.tar.gz) = lKW+bGh57GvLRBxHbMDfjE/8OJlavq/htgPrK2Wj14s= SHA256 (st-0.4.tar.gz) = MHrvAdDeBBFDm/MtVcI6kw53nv0AOjGsqg3c+LRaOv4=
SIZE (st/0.3.tar.gz) = 25637 SIZE (st-0.4.tar.gz) = 32396

11
x11/st/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.2 2012/11/05 13:24:39 zinke Exp $ $OpenBSD: patch-Makefile,v 1.3 2013/04/19 19:54:34 bentley Exp $
--- Makefile.orig Fri Nov 2 20:08:27 2012 --- Makefile.orig Fri Mar 29 12:54:53 2013
+++ Makefile Sun Nov 4 16:32:45 2012 +++ Makefile Fri Mar 29 12:58:38 2013
@@ -18,14 +18,12 @@ config.h: @@ -18,14 +18,12 @@ config.h:
cp config.def.h config.h cp config.def.h config.h
@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.2 2012/11/05 13:24:39 zinke Exp $
clean: clean:
@echo cleaning @echo cleaning
@@ -40,17 +38,13 @@ dist: clean @@ -40,16 +38,13 @@ dist: clean
@rm -rf st-${VERSION} @rm -rf st-${VERSION}
install: all install: all
@ -30,8 +30,7 @@ $OpenBSD: patch-Makefile,v 1.2 2012/11/05 13:24:39 zinke Exp $
- @mkdir -p ${DESTDIR}${MANPREFIX}/man1 - @mkdir -p ${DESTDIR}${MANPREFIX}/man1
- @sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1 - @sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1 - @chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
- @echo If things do not seem to work, be sure that there is no \ - @echo Please see the README file regarding the terminfo entry of st.
- floating st terminfo in the .terminfo directory in your home dir.
- @tic -s st.info - @tic -s st.info
+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin + ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+ ${BSD_INSTALL_PROGRAM} st ${DESTDIR}${PREFIX}/bin + ${BSD_INSTALL_PROGRAM} st ${DESTDIR}${PREFIX}/bin

18
x11/st/patches/patch-config_def_h
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-config_def_h,v 1.3 2012/11/05 13:24:39 zinke Exp $ $OpenBSD: patch-config_def_h,v 1.4 2013/04/19 19:54:34 bentley Exp $
--- config.def.h.orig Fri Nov 2 20:08:27 2012 --- config.def.h.orig Fri Mar 29 12:59:39 2013
+++ config.def.h Sun Nov 4 17:33:01 2012 +++ config.def.h Fri Mar 29 13:00:16 2013
@@ -1,7 +1,7 @@ @@ -5,7 +5,7 @@
/* See LICENSE file for copyright and license details. */ *
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
/* appearance */ */
-static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false"; -static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
+static char font[] = "Liberation Mono:pixelsize=12:antialias=true:autohint=false"; +static char font[] = "Liberation Mono:pixelsize=12:antialias=true:autohint=false";
static unsigned int borderpx = 2; static int borderpx = 2;
static char shell[] = "/bin/sh"; static char shell[] = "/bin/sh";
@@ -25,7 +25,7 @@ static const char *colorname[] = { @@ -33,7 +33,7 @@ static const char *colorname[] = {
"blue2", "blue2",
"magenta3", "magenta3",
"cyan3", "cyan3",

30
x11/st/patches/patch-config_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_mk,v 1.3 2012/11/05 13:24:39 zinke Exp $ $OpenBSD: patch-config_mk,v 1.4 2013/04/19 19:54:34 bentley Exp $
--- config.mk.orig Fri Nov 2 20:08:27 2012 --- config.mk.orig Fri Mar 29 12:13:26 2013
+++ config.mk Sun Nov 4 17:17:13 2012 +++ config.mk Thu Apr 4 22:18:33 2013
@@ -4,20 +4,20 @@ VERSION = 0.3 @@ -4,24 +4,24 @@ VERSION = 0.4
# Customize below to fit your system # Customize below to fit your system
# paths # paths
@ -16,17 +16,23 @@ $OpenBSD: patch-config_mk,v 1.3 2012/11/05 13:24:39 zinke Exp $
+X11LIB = ${X11BASE}/lib +X11LIB = ${X11BASE}/lib
# includes and libs # includes and libs
-INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2 INCS = -I. -I/usr/include -I${X11INC} \
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig - $(shell pkg-config --cflags fontconfig) \
+INCS = -I${X11INC} -I${X11INC}/freetype2 - $(shell pkg-config --cflags freetype2)
+LIBS = -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig + `pkg-config --cflags fontconfig` \
+ `pkg-config --cflags freetype2`
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft \
- $(shell pkg-config --libs fontconfig) \
- $(shell pkg-config --libs freetype2)
+ `pkg-config --libs fontconfig` \
+ `pkg-config --libs freetype2`
# flags # flags
-CPPFLAGS = -DVERSION=\"${VERSION}\" -CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600
-CFLAGS += -g -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} -CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -Os ${INCS} ${CPPFLAGS}
-LDFLAGS += -g ${LIBS} -LDFLAGS += -g ${LIBS}
+CPPFLAGS += -DVERSION=\"${VERSION}\" +CPPFLAGS += -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600
+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} +CFLAGS += -std=c99 -pedantic -Wall -Wvariadic-macros ${INCS} ${CPPFLAGS}
+LDFLAGS += ${LIBS} +LDFLAGS += ${LIBS}
# compiler and linker # compiler and linker