Date: Sat, 20 Mar 2010 01:13:44 -0700 From: Timothy Beyer <beyert@cs.ucr.edu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Timothy Beyer <beyert@cs.ucr.edu> Subject: ports/144895: update port: graphics/ocaml-images to version 3.0.2 Message-ID: <87634rmmvb.wl@fastmail.fm> Resent-Message-ID: <201003200820.o2K8K1M7012753@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 144895
>Category: ports
>Synopsis: update port: graphics/ocaml-images to version 3.0.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 20 08:20:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Timothy Beyer
>Release: FreeBSD 8.0-RELEASE-p2 i386
>Organization:
no organization
>Environment:
System: FreeBSD aeonserv.aeonnet 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Fri Jan 29 18:00:42 PST 2010 beyert@aeonserv.aeonnet:/usr/src/sys/i386/compile/CUSTOM i386
>Description:
This patch makes the following changes:
-Updates ocaml-images to the latest version (in Makefile)
-Makes according changes to distinfo
-Makes according changes to pkg-install
-removed all patches in files/ since they are no longer needed in the current version (hence removed all files/ in files.diff)
>How-To-Repeat:
Apply the patches
>Fix:
The included patches
--- Makefile.diff begins here ---
--- Makefile.orig 2010-02-05 06:34:59.000000000 -0800
+++ Makefile 2010-03-14 23:57:44.000000000 -0700
@@ -7,23 +7,23 @@
#
PORTNAME= images
-PORTVERSION= 2.2
-PORTREVISION= 1
+PORTVERSION= 3.0.2
PORTEPOCH= 2
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/
+MASTER_SITES= \
+ ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/:1 \
+ http://caml.inria.fr/distrib/bazar-ocaml/:1 \
+ http://forge.ocamlcore.org/frs/download.php/181/:2
PKGNAMEPREFIX= ocaml-
DISTNAME= camlimages-${PORTVERSION}
-EXTRACT_SUFX= .tgz
+DISTFILES= ocaml-autoconf-1.0.tar.gz:2 camlimages-3.0.2.tgz:1
MAINTAINER= ports@FreeBSD.org
COMMENT= Objective Caml image processing library
BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \
- lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
RUN_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \
- lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
png.5:${PORTSDIR}/graphics/png \
@@ -38,7 +38,8 @@
CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --includedir=${LOCALBASE}/include
+CONFIGURE_ARGS= --includedir=${LOCALBASE}/include --without-lablgtk \
+ --without-lablgtk2
USE_GMAKE= yes
PKGDEINSTALL= ${PKGINSTALL}
@@ -48,23 +49,29 @@
DOCSDIR= ${PREFIX}/share/doc/ocaml-images
.if !defined(NOPORTDOCS)
-PORTDOCS= Announce Announce-2.2 CHANGES INSTALL LICENSE doc
+PORTDOCS= Announce Announce-3.0.2 CHANGES INSTALL README LICENSE doc
.endif
+post-configure:
+ ${CP} -pR ${WRKDIR}/ocaml-autoconf-1.0 ${WRKDIR}/autoconf
+
post-install:
.if !defined(NOPORTDOCS)
@${ECHO_MSG} -n ">> Installing documentation..."
@${MKDIR} ${DOCSDIR}
@cd ${WRKSRC} && ${FIND} doc | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
@${INSTALL_DATA} ${WRKSRC}/Announce ${DOCSDIR}/
- @${INSTALL_DATA} ${WRKSRC}/Announce-2.2 ${DOCSDIR}/
+ @${INSTALL_DATA} ${WRKSRC}/Announce-3.0.2 ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}/
+ @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}/
@${ECHO_MSG} " [DONE]"
.endif
- @${FIND} ${PREFIX}/lib/ocaml/camlimages -type f | \
+ @${FIND} ${PREFIX}/lib/ocaml/site-lib/camlimages -type f | \
${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
- @${ECHO_CMD} "@dirrm lib/ocaml/camlimages" >> ${TMPPLIST}
+ @${ECHO_CMD} "lib/ocaml/stublibs/dllcamlimages.so" >> ${TMPPLIST}
+ @${ECHO_CMD} "lib/ocaml/stublibs/dllcamlimages_core.so" >> ${TMPPLIST}
+ @${ECHO_CMD} "@dirrm lib/ocaml/site-lib/camlimages" >> ${TMPPLIST}
.include <bsd.port.mk>
--- Makefile.diff ends here ---
--- distinfo.diff begins here ---
--- distinfo.orig 2009-11-21 03:37:59.000000000 -0800
+++ distinfo 2010-03-14 18:08:29.000000000 -0700
@@ -1,3 +1,6 @@
-MD5 (camlimages-2.2.tgz) = d933eb58c7983f70b1a000fa01893aa4
-SHA256 (camlimages-2.2.tgz) = 9b8861d7b8c6752ad33ef2af5c486efa626b19ad9ea190641a736384629f1026
-SIZE (camlimages-2.2.tgz) = 1385525
+MD5 (ocaml-autoconf-1.0.tar.gz) = 2eab5efad4364d2f0114f38e00af09ac
+SHA256 (ocaml-autoconf-1.0.tar.gz) = 67e85520f65c033c86e99e5438e51657e777579034570527c1b2c62096ecb004
+SIZE (ocaml-autoconf-1.0.tar.gz) = 11337
+MD5 (camlimages-3.0.2.tgz) = ccb2551232df255f6306941d26d07615
+SHA256 (camlimages-3.0.2.tgz) = db5aec421c89bea7b1bf55df6a674a0a6ac245f89c220c818e2e5d83f623662c
+SIZE (camlimages-3.0.2.tgz) = 1429138
--- distinfo.diff ends here ---
--- pkg-install.diff begins here ---
--- pkg-install.orig 2004-03-23 19:13:46.000000000 -0800
+++ pkg-install 2010-03-14 23:52:41.000000000 -0700
@@ -1,9 +1,9 @@
#!/bin/sh
if [ "$2" = "POST-INSTALL" ]; then
- echo "${PKG_PREFIX}/lib/ocaml/camlimages" >> ${PKG_PREFIX}/lib/ocaml/ld.conf
+ echo "${PKG_PREFIX}/lib/ocaml/site-lib/camlimages" >> ${PKG_PREFIX}/lib/ocaml/ld.conf
elif [ "$2" = "DEINSTALL" ]; then
mv ${PKG_PREFIX}/lib/ocaml/ld.conf ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
- grep -v camlimages ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp > ${PKG_PREFIX}/lib/ocaml/ld.conf
+ grep -v site-lib/camlimages ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp > ${PKG_PREFIX}/lib/ocaml/ld.conf
rm -f ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
fi
--- pkg-install.diff ends here ---
--- files.diff begins here ---
diff -urN files.orig/patch-tiff::tiffread.c files/patch-tiff::tiffread.c
--- files.orig/patch-tiff::tiffread.c 2005-12-05 09:44:35.000000000 -0800
+++ files/patch-tiff::tiffread.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,14 +0,0 @@
---- tiff/tiffread.c.orig Tue Sep 21 23:56:44 2004
-+++ tiff/tiffread.c Mon Dec 5 09:25:43 2005
-@@ -28,11 +28,6 @@
-
- #include <tiffio.h>
-
--#undef int16
--#undef uint16
--#undef int32
--#undef uint32
--
- extern value *imglib_error;
-
- value open_tiff_file_for_read( name )
--- files.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?87634rmmvb.wl>