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

give fonts/lib a better chance to work when starting from scratch:

Browse Source 
- don't save fonts.dir, regenerate.
- run ldconfig after installing a lib.
- mark pixman as not for vax/landisk.
This commit is contained in:
espie 2012-11-05 20:27:52 +00:00
parent 7c0fe71272
commit 4031b955ab
11 changed files with 62 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/bootstrap/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/11/01 09:58:06 espie Exp $
# $OpenBSD: Makefile,v 1.2 2012/11/05 20:27:52 espie Exp $
COMMENT = base system pseudo package bootstrap
CATEGORIES = base xenocara
NO_BUILD = Yes
DISTNAME = base-boostrap-0
DISTNAME = base-bootstrap-0
DISTFILES =
PERMIT_PACKAGE_CDROM= Yes

16
base/xenocara/font/Makefile.inc
View File

@ -1,6 +1,20 @@
# $OpenBSD: Makefile.inc,v 1.1.1.1 2012/11/01 09:58:05 espie Exp $
# $OpenBSD: Makefile.inc,v 1.2 2012/11/05 20:27:52 espie Exp $
MODULES += base/xenocara
.if ${COMPONENT:M*-type1}
FONTSDIRS = lib/X11/fonts/Type1
.elif ${COMPONENT:M*-100dpi}
FONTSDIRS ?= lib/X11/fonts/100dpi
.elif ${COMPONENT:M*-75dpi}
FONTSDIRS ?= lib/X11/fonts/75dpi
.elif ${COMPONENT:M*-ttf}
FONTSDIRS ?= lib/X11/fonts/TTF
.elif ${COMPONENT:M*-misc}
FONTSDIRS ?= lib/X11/fonts/misc
.elif ${COMPONENT:M*-cyrillic}
FONTSDIRS ?= lib/X11/fonts/cyrillic
.endif
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes

14
base/xenocara/font/alias/Makefile
View File

@ -1,3 +1,15 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/11/01 09:58:05 espie Exp $
# $OpenBSD: Makefile,v 1.2 2012/11/05 20:27:52 espie Exp $
COMPONENT = font/alias
XDEPS = font/adobe-100dpi font/adobe-75dpi font/adobe-utopia-100dpi \
font/adobe-utopia-75dpi font/adobe-utopia-type1 font/arabic-misc \
font/bh-100dpi font/bh-75dpi font/bh-lucidatypewriter-100dpi \
font/bh-lucidatypewriter-75dpi font/bh-ttf font/bh-type1 \
font/bitstream-100dpi font/bitstream-75dpi font/bitstream-type1 \
font/cronyx-cyrillic font/cursor-misc font/daewoo-misc font/dec-misc \
font/dejavu-ttf font/encodings font/ibm-type1 font/isas-misc font/jis-misc \
font/micro-misc font/misc-cyrillic font/misc-ethiopic font/misc-meltho \
font/misc-misc font/mutt-misc font/schumacher-misc font/screen-cyrillic \
font/sony-misc font/sun-misc font/util font/winitzki-cyrillic \
font/xfree86-type1
.include <bsd.port.mk>

4
base/xenocara/font/misc-ethiopic/Makefile
View File

@ -1,3 +1,5 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/11/01 09:58:05 espie Exp $
# $OpenBSD: Makefile,v 1.2 2012/11/05 20:27:52 espie Exp $
COMPONENT = font/misc-ethiopic
FONTSDIRS = lib/X11/fonts/OTF lib/X11/fonts/TTF
.include <bsd.port.mk>

3
base/xenocara/font/misc-meltho/Makefile
View File

@ -1,3 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/11/01 09:58:05 espie Exp $
# $OpenBSD: Makefile,v 1.2 2012/11/05 20:27:52 espie Exp $
COMPONENT = font/misc-meltho
FONTSDIRS = lib/X11/fonts/OTF
.include <bsd.port.mk>

3
base/xenocara/lib/Makefile.inc
View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile.inc,v 1.1.1.1 2012/11/01 09:58:05 espie Exp $
# $OpenBSD: Makefile.inc,v 1.2 2012/11/05 20:27:52 espie Exp $
MODULES += base/xenocara
COMPONENT_TYPE += lib
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

3
base/xenocara/lib/pixman/Makefile
View File

@ -1,5 +1,6 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/11/01 09:58:05 espie Exp $
# $OpenBSD: Makefile,v 1.2 2012/11/05 20:27:52 espie Exp $
COMPONENT = lib/pixman
NOT_FOR_ARCHS = vax landisk
XDEPS = lib/libpthread-stubs

2
base/xenocara/pkg/PFRAG.FONT Normal file
View File

@ -0,0 +1,2 @@
@exec cd ${X11BASE} && bin/mkfontscale -- ${FONTSDIRS}
@exec cd ${X11BASE} && bin/mkfontdir -- ${FONTSDIRS}

1
base/xenocara/pkg/PFRAG.LIB Normal file
View File

@ -0,0 +1 @@
@exec /sbin/ldconfig -R ${X11BASE}/lib

4
base/xenocara/pkg/PLIST
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/11/01 09:58:06 espie Exp $
@comment $OpenBSD: PLIST,v 1.2 2012/11/05 20:27:52 espie Exp $
libdata/base/${FULLPKGNAME}.gen
libdata/base/${FULLPKGNAME}.manifest
@exec %D/libexec/component-install ${FULLPKGNAME}
%%LIB%%
%%FONT%%

20
base/xenocara/xenocara.port.mk
View File

@ -1,9 +1,9 @@
# $OpenBSD: xenocara.port.mk,v 1.2 2012/11/03 09:41:55 espie Exp $
# $OpenBSD: xenocara.port.mk,v 1.3 2012/11/05 20:27:52 espie Exp $
CATEGORIES = base xenocara
COMMENT = Xenocara ${COMPONENT}
FLAT = ${COMPONENT:S/\//./g:C/-([0-9])/_\1/g}
VERSION ?= 0
VERSION ?= 1
DISTNAME = xc-${FLAT}-${VERSION}
DISTFILES =
@ -28,6 +28,20 @@ XENOCARA_COMPONENT = Yes
BUILD_DEPENDS = ${XDEPS:S,^,base/xenocara/,}
RUN_DEPENDS = ${BUILD_DEPENDS}
COMPONENT_TYPE ?=
.if ${COMPONENT_TYPE:Mlib}
PKG_ARGS += -DLIB=1
.else
PKG_ARGS += -DLIB=0
.endif
.if defined(FONTSDIRS) && !empty(FONTSDIRS)
PKG_ARGS += -DFONT=1
SUBST_VARS += ${FONTSDIRS}
.else
PKG_ARGS += -DFONT=0
.endif
.if ${COMPONENT} != "share/mk"
BUILD_DEPENDS += base/xenocara/share/mk
@ -85,7 +99,7 @@ pre-install:
.if !target(post-install)
post-install:
mkdir -p ${LOCATION}
@cd ${WRKINST} && find . -print >goodlist
@cd ${WRKINST} && find . -print |fgrep -v -e /fonts.dir -e /fonts.scale >goodlist
@echo ./goodlist >>${WRKDIR}/badlist
mkdir -p ${PREFIX}/libdata/base
@sort ${WRKINST}/goodlist ${WRKDIR}/badlist |uniq -u >${MANIFEST}