From 03e9478acc6f951aade8dbab2e0e7560f49d2643 Mon Sep 17 00:00:00 2001 From: Joseph Koshy Date: Wed, 20 Sep 2006 06:25:49 +0000 Subject: - 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. --- lang/drscheme/Makefile | 9 +++++++-- .../drscheme/files/patch-collects-profj-to-scheme.ss | 20 ++++++++++++++++++++ lang/drscheme/pkg-plist | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 lang/drscheme/files/patch-collects-profj-to-scheme.ss (limited to 'lang/drscheme') diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile index 9c1b12d60327..b10d5b02d4c3 100644 --- a/lang/drscheme/Makefile +++ b/lang/drscheme/Makefile @@ -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 diff --git a/lang/drscheme/files/patch-collects-profj-to-scheme.ss b/lang/drscheme/files/patch-collects-profj-to-scheme.ss new file mode 100644 index 000000000000..78032d895fd7 --- /dev/null +++ b/lang/drscheme/files/patch-collects-profj-to-scheme.ss @@ -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