Date: Thu, 29 May 2014 13:18:19 -0700 (PDT) From: Zhihao Yuan <zy@miator.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/190385: Add stage support & update some ports I maintain Message-ID: <5387960b.6638ec0a.5c2c.ffffb643@mx.google.com> Resent-Message-ID: <201405292020.s4TKK0j1038276@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190385
>Category: ports
>Synopsis: Add stage support & update some ports I maintain
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu May 29 20:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Zhihao Yuan
>Release: FreeBSD 8.4-STABLE amd64
>Organization:
Rackspace Inc.
>Environment:
System: FreeBSD elitebook.hp 8.4-STABLE FreeBSD 8.4-STABLE #11 r264285: Wed Apr 9 01:33:27 EDT 2014 lichray@elitebook.hp:/usr/obj/usr/src/sys/HOUKAGO amd64
>Description:
lang/scheme48 1.9 -> 1.9.2, compiles with clang, stage
graphics/driconf stage
graphics/pinpoint stage
x11-fonts/gbdfed stage
x11-fonts/hanazono-fonts-ttf 20131208, stage
>How-To-Repeat:
>Fix:
--- driconf-stage.diff begins here ---
Index: graphics/driconf/Makefile
===================================================================
--- graphics/driconf/Makefile (revision 355723)
+++ graphics/driconf/Makefile (working copy)
@@ -21,10 +21,9 @@
INSTALLS_EGGINFO= yes
PYDISTUTILS_EGGINFODIR= lib/driconf
-NO_STAGE= yes
pre-patch:
@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
- -e 's|/usr/local|${PREFIX}|'
+ -e 's|/usr/local|${STAGEDIR}${PREFIX}|'
do-install:
@(cd ${WRKSRC} && ${PYTHON_CMD} setup.py install)
--- driconf-stage.diff ends here ---
--- gbdfed-stage.diff begins here ---
Index: x11-fonts/gbdfed/Makefile
===================================================================
--- x11-fonts/gbdfed/Makefile (revision 355741)
+++ x11-fonts/gbdfed/Makefile (working copy)
@@ -20,5 +20,4 @@
MAN1= gbdfed.1
PLIST_FILES= bin/gbdfed
-NO_STAGE= yes
.include <bsd.port.mk>
--- gbdfed-stage.diff ends here ---
--- pinpoint-stage.diff begins here ---
Index: graphics/pinpoint/Makefile
===================================================================
--- graphics/pinpoint/Makefile (revision 355723)
+++ graphics/pinpoint/Makefile (working copy)
@@ -3,7 +3,7 @@
PORTNAME= pinpoint
DISTVERSION= 0.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= GNOME
@@ -23,7 +23,6 @@
OPTIONS_DEFINE= GST
GST_DESC= Live videos as slide backgrounds
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MGST}
--- pinpoint-stage.diff ends here ---
--- scheme48-stage-1.9.2.diff begins here ---
Index: lang/scheme48/Makefile
===================================================================
--- lang/scheme48/Makefile (revision 355728)
+++ lang/scheme48/Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= scheme48
-PORTVERSION= 1.9
+PORTVERSION= 1.9.2
CATEGORIES= lang scheme
MASTER_SITES= http://www.s48.org/${PORTVERSION}/
EXTRACT_SUFX= .tgz
@@ -18,10 +18,6 @@
USES= gmake
GNU_CONFIGURE= yes
-MAN1= scheme48.1
-
-NO_STAGE= yes
-
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
@@ -38,8 +34,8 @@
-e '/INSTALL.*COPYING/d' \
${WRKSRC}/Makefile.in
.if ${PORT_OPTIONS:MDOCS}
-USE_TEX= yes
-CONFIGURE_ARGS+=--docdir=${DOCSDIR}
+USE_TEX= yes
+CONFIGURE_ARGS+=--docdir="${DOCSDIR}"
.else
@${REINPLACE_CMD} \
-e 's/install-doc$$//' \
@@ -48,6 +44,6 @@
.endif
test:
- cd ${WRKSRC}; ${MAKE} check
+ ${MAKE} -C ${WRKSRC} check
.include <bsd.port.mk>
Index: lang/scheme48/distinfo
===================================================================
--- lang/scheme48/distinfo (revision 355728)
+++ lang/scheme48/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (scheme48-1.9.tgz) = dcba91d150b7490e6170ef4fbd45a065ba0d8d6e228946379da0d1d7cba78267
-SIZE (scheme48-1.9.tgz) = 3945425
+SHA256 (scheme48-1.9.2.tgz) = 9c4921a90e95daee067cd2e9cc0ffe09e118f4da01c0c0198e577c4f47759df4
+SIZE (scheme48-1.9.2.tgz) = 3951356
Index: lang/scheme48/pkg-plist
===================================================================
--- lang/scheme48/pkg-plist (revision 355728)
+++ lang/scheme48/pkg-plist (working copy)
@@ -14,6 +14,7 @@
lib/scheme48-%%VER%%/scheme48.image
lib/scheme48-%%VER%%/scheme48vm
lib/scheme48-%%VER%%/srfi-27.so
+man/man1/scheme48.1.gz
%%PORTDOCS%%%%DOCSDIR%%/manual-Z-G-D-1.gif
%%PORTDOCS%%%%DOCSDIR%%/manual-Z-H-1.html
%%PORTDOCS%%%%DOCSDIR%%/manual-Z-H-10.html
--- scheme48-stage-1.9.2.diff ends here ---
--- hanazono-fonts-ttf-stage-20131208.diff begins here ---
Index: x11-fonts/hanazono-fonts-ttf/Makefile
===================================================================
--- x11-fonts/hanazono-fonts-ttf/Makefile (revision 355741)
+++ x11-fonts/hanazono-fonts-ttf/Makefile (working copy)
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= hanazono-fonts-ttf
-PORTVERSION= 20120421
+PORTVERSION= 20131208
CATEGORIES= x11-fonts
MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= hanazono-font/55644
+MASTER_SITE_SUBDIR= hanazono-font/60001
DISTNAME= ${PORTNAME:C/-.*//}-${PORTVERSION}
MAINTAINER= lichray@gmail.com
@@ -25,7 +25,6 @@
SUB_FILES= pkg-message
SUB_LIST= FONTDIR=${FONTDIR}
-NO_STAGE= yes
do-build:
@cd ${WRKSRC}/ && \
${LOCALBASE}/bin/mkfontscale && \
@@ -32,8 +31,9 @@
${LOCALBASE}/bin/mkfontdir
do-install:
- ${MKDIR} ${PREFIX}/${FONTDIR}/
- cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf fonts.* ${PREFIX}/${FONTDIR}/
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}/
+ cd ${WRKSRC}/ && \
+ ${INSTALL_DATA} *.ttf fonts.* ${STAGEDIR}${PREFIX}/${FONTDIR}/
post-install:
@${CAT} ${PKGMESSAGE}
Index: x11-fonts/hanazono-fonts-ttf/distinfo
===================================================================
--- x11-fonts/hanazono-fonts-ttf/distinfo (revision 355741)
+++ x11-fonts/hanazono-fonts-ttf/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (hanazono-20120421.zip) = e62c4437e80728eec287cd88c8c48d7db8a0044902b57a02531e8cc9d3ad008a
-SIZE (hanazono-20120421.zip) = 24281236
+SHA256 (hanazono-20131208.zip) = 259b54ce7fd6ec9ca3e2bdbecebe476de897b3f0da1d2e3b81d23285c1d34f0b
+SIZE (hanazono-20131208.zip) = 24737240
--- hanazono-fonts-ttf-stage-20131208.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5387960b.6638ec0a.5c2c.ffffb643>