1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00

- Bring down the parts of upstream change SVN#4389 that make

.zo file generation more deterministic.  Package building
  should work reliably now, so unbreak the port.
- Explicitly depend on -lXft.
- Change the build to always use the libjpeg and libpng
  libraries bundled with the source package.
This commit is contained in:
Joseph Koshy 2006-09-20 06:25:49 +00:00
parent 60ae946d93
commit 03e9478acc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=173446
3 changed files with 28 additions and 3 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= drscheme
PORTVERSION= 351
PORTREVISION= 1
CATEGORIES= lang scheme
MASTER_SITES= http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/ \
http://www.cs.utah.edu/plt/download/${PORTVERSION}/plt/ \
@ -22,11 +23,12 @@ EXTRACT_ONLY= plt-${PORTVERSION}-src-unix.tgz
MAINTAINER= jkoshy@FreeBSD.org
COMMENT= An interactive, integrated, graphical Scheme programming environment
BROKEN= Does not compile
LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --enable-shared --x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib --enable-lt=${LIBTOOL}
--x-libraries=${X11BASE}/lib --enable-lt=${LIBTOOL} --disable-libpng \
--disable-libjpeg
WRKSRC= ${WRKDIR}/plt/src
USE_LDCONFIG= yes
@ -59,4 +61,7 @@ PLIST_SUB+= MMM=""
PLIST_SUB+= MMM="@comment "
.endif
post-patch:
${RM} ${WRKSRC}/../collects/profj/to-scheme.ss.orig
.include <bsd.port.post.mk>

View File

@ -0,0 +1,20 @@
--- ../collects/profj/to-scheme.ss 2006/08/02 03:53:43 3922
+++ ../trunk/collects/profj/to-scheme.ss 2006/09/19 21:01:05 4389
@@ -341,13 +341,14 @@
(member (id-string (name-id extend))
(map id-string (map def-name ordered-defs)))))
- ;make-composite-name: def -> string
+ ;make-composite-name: string -> string
(define (make-composite-name d)
- (build-identifier (string-append (id-string (header-id (def-header d))) "-composite")))
+ (build-identifier (string-append d "-composite")))
;translate-defs: (list def) type-records -> (values (list syntax) (list reqs))
(define (translate-defs defs type-recs)
- (module-name (make-composite-name (car defs)))
+ (let ((sorted-d-list (sort (map (compose id-string def-name) defs) string<?)))
+ (module-name (make-composite-name (car sorted-d-list))))
(module-require (if (to-file)
(let ((location (build-path (begin (send type-recs set-location! (def-file (car defs)))
(send type-recs get-compilation-location) "compiled")

View File

@ -1797,6 +1797,7 @@ lib/plt/collects/htdch/graphics/compiled/Command.jinfo
lib/plt/collects/htdch/graphics/compiled/Command.zo
lib/plt/collects/htdch/graphics/compiled/CommandSequence.jinfo
lib/plt/collects/htdch/graphics/compiled/CommandSequence.zo
lib/plt/collects/htdch/graphics/compiled/CommandSequence-composite.zo
lib/plt/collects/htdch/graphics/compiled/DrawImage.jinfo
lib/plt/collects/htdch/graphics/compiled/DrawImage.zo
lib/plt/collects/htdch/graphics/compiled/DrawLine.jinfo
@ -1825,7 +1826,6 @@ lib/plt/collects/htdch/graphics/compiled/Red.jinfo
lib/plt/collects/htdch/graphics/compiled/Red.zo
lib/plt/collects/htdch/graphics/compiled/View.jinfo
lib/plt/collects/htdch/graphics/compiled/View.zo
lib/plt/collects/htdch/graphics/compiled/View-composite.zo
lib/plt/collects/htdch/graphics/compiled/White.jinfo
lib/plt/collects/htdch/graphics/compiled/White.zo
lib/plt/collects/htdch/graphics/compiled/World.jinfo