Update to st-0.4.
ok jung@ (MAINTAINER)
This commit is contained in:
bentley
parent
2ebb722a86
commit
bcd958a614
@ -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
|
||||
|
||||
DISTNAME= 0.3
|
||||
PKGNAME= st-${DISTNAME}
|
||||
DIST_SUBDIR= st
|
||||
DISTNAME= st-0.4
|
||||
|
||||
CATEGORIES= x11
|
||||
|
||||
HOMEPAGE= http://st.suckless.org/
|
||||
|
||||
MAINTAINER= Joerg Zinke <zinke@openbsd.org>
|
||||
MAINTAINER= Joerg Jung <jung@openbsd.org>
|
||||
|
||||
# MIT/X Consortium License
|
||||
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
|
||||
|
||||
MAKE_ENV= LDFLAGS="${LDFLAGS}"
|
||||
FAKE_FLAGS= DESTDIR=""
|
||||
WRKDIST= ${WRKDIR}/st-${DISTNAME}
|
||||
|
||||
NO_TEST= Yes
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (st/0.3.tar.gz) = lKW+bGh57GvLRBxHbMDfjE/8OJlavq/htgPrK2Wj14s=
|
||||
SIZE (st/0.3.tar.gz) = 25637
|
||||
SHA256 (st-0.4.tar.gz) = MHrvAdDeBBFDm/MtVcI6kw53nv0AOjGsqg3c+LRaOv4=
|
||||
SIZE (st-0.4.tar.gz) = 32396
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Makefile,v 1.2 2012/11/05 13:24:39 zinke Exp $
|
||||
--- Makefile.orig Fri Nov 2 20:08:27 2012
|
||||
+++ Makefile Sun Nov 4 16:32:45 2012
|
||||
$OpenBSD: patch-Makefile,v 1.3 2013/04/19 19:54:34 bentley Exp $
|
||||
--- Makefile.orig Fri Mar 29 12:54:53 2013
|
||||
+++ Makefile Fri Mar 29 12:58:38 2013
|
||||
@@ -18,14 +18,12 @@ 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:
|
||||
@echo cleaning
|
||||
@@ -40,17 +38,13 @@ dist: clean
|
||||
@@ -40,16 +38,13 @@ dist: clean
|
||||
@rm -rf st-${VERSION}
|
||||
|
||||
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
|
||||
- @sed "s/VERSION/${VERSION}/g" < st.1 > ${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 \
|
||||
- floating st terminfo in the .terminfo directory in your home dir.
|
||||
- @echo Please see the README file regarding the terminfo entry of st.
|
||||
- @tic -s st.info
|
||||
+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
|
||||
+ ${BSD_INSTALL_PROGRAM} st ${DESTDIR}${PREFIX}/bin
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-config_def_h,v 1.3 2012/11/05 13:24:39 zinke Exp $
|
||||
--- config.def.h.orig Fri Nov 2 20:08:27 2012
|
||||
+++ config.def.h Sun Nov 4 17:33:01 2012
|
||||
@@ -1,7 +1,7 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
|
||||
/* appearance */
|
||||
$OpenBSD: patch-config_def_h,v 1.4 2013/04/19 19:54:34 bentley Exp $
|
||||
--- config.def.h.orig Fri Mar 29 12:59:39 2013
|
||||
+++ config.def.h Fri Mar 29 13:00:16 2013
|
||||
@@ -5,7 +5,7 @@
|
||||
*
|
||||
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||
*/
|
||||
-static char font[] = "Liberation Mono:pixelsize=12:antialias=false: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";
|
||||
|
||||
@@ -25,7 +25,7 @@ static const char *colorname[] = {
|
||||
@@ -33,7 +33,7 @@ static const char *colorname[] = {
|
||||
"blue2",
|
||||
"magenta3",
|
||||
"cyan3",
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-config_mk,v 1.3 2012/11/05 13:24:39 zinke Exp $
|
||||
--- config.mk.orig Fri Nov 2 20:08:27 2012
|
||||
+++ config.mk Sun Nov 4 17:17:13 2012
|
||||
@@ -4,20 +4,20 @@ VERSION = 0.3
|
||||
$OpenBSD: patch-config_mk,v 1.4 2013/04/19 19:54:34 bentley Exp $
|
||||
--- config.mk.orig Fri Mar 29 12:13:26 2013
|
||||
+++ config.mk Thu Apr 4 22:18:33 2013
|
||||
@@ -4,24 +4,24 @@ VERSION = 0.4
|
||||
# Customize below to fit your system
|
||||
|
||||
# paths
|
||||
@ -16,17 +16,23 @@ $OpenBSD: patch-config_mk,v 1.3 2012/11/05 13:24:39 zinke Exp $
|
||||
+X11LIB = ${X11BASE}/lib
|
||||
|
||||
# includes and libs
|
||||
-INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2
|
||||
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig
|
||||
+INCS = -I${X11INC} -I${X11INC}/freetype2
|
||||
+LIBS = -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig
|
||||
INCS = -I. -I/usr/include -I${X11INC} \
|
||||
- $(shell pkg-config --cflags fontconfig) \
|
||||
- $(shell pkg-config --cflags freetype2)
|
||||
+ `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
|
||||
-CPPFLAGS = -DVERSION=\"${VERSION}\"
|
||||
-CFLAGS += -g -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
|
||||
-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600
|
||||
-CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -Os ${INCS} ${CPPFLAGS}
|
||||
-LDFLAGS += -g ${LIBS}
|
||||
+CPPFLAGS += -DVERSION=\"${VERSION}\"
|
||||
+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
|
||||
+CPPFLAGS += -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600
|
||||
+CFLAGS += -std=c99 -pedantic -Wall -Wvariadic-macros ${INCS} ${CPPFLAGS}
|
||||
+LDFLAGS += ${LIBS}
|
||||
|
||||
# compiler and linker
|
||||
|
||||
Loading…
Reference in New Issue
Block a user