Date: Fri, 19 Mar 2010 20:06:04 -0700 From: Timothy Beyer <beyert@cs.ucr.edu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Timothy Beyer <beyert@cs.ucr.edu> Subject: ports/144886: update port: print/advi to version 1.9 Message-ID: <877hp7n143.wl@fastmail.fm> Resent-Message-ID: <201003200330.o2K3U6To031531@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 144886
>Category: ports
>Synopsis: update port: print/advi to version 1.9
>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 03:30:05 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 advi to the latest version (in Makefile)
-Makes according changes to distinfo
-Makes according changes to pkg-plist
-Removed existing patches in files/ and replaced them with a configure patch (the build configuration in this version has changed substantially from prior versions)
Apply the problem reports "update port: graphics/ocaml-images to version 3.0.2"
and "new port: textproc/htmlc"
both are are required to build this port properly.
>How-To-Repeat:
Apply the patches
>Fix:
The included patches,
Apply the 2 other submitted problem reports as a prerequisite to this problem report.
--- Makefile.diff begins here ---
--- Makefile.orig 2010-02-05 06:38:54.000000000 -0800
+++ Makefile 2010-03-19 19:42:36.000000000 -0700
@@ -3,26 +3,32 @@
# Whom: Stanislav Sedov <ssedov@mbsd.msk.ru>
#
# $MBSDlabs$
-# $FreeBSD: ports/print/advi/Makefile,v 1.10 2010/02/05 11:43:01 dinoex Exp $
+# $FreeBSD: ports/print/advi/Makefile,v 1.11 2010/03/14 20:00:00 beyert Exp $
#
PORTNAME= advi
-PORTVERSION= 1.6.0
-PORTREVISION= 4
+PORTVERSION= 1.9
CATEGORIES= print
-MASTER_SITES= http://caml.inria.fr/distrib/bazar-ocaml/${PORTNAME}/
-EXTRACT_SUFX= .tgz
+MASTER_SITES= http://gallium.inria.fr/${PORTNAME}/ \
+ http://caml.inria.fr/distrib/bazar-ocaml/${PORTNAME}/
MAINTAINER= stas@FreeBSD.org
COMMENT= Active-DVI viewer
-BUILD_DEPENDS= ${CI_DEPEND}:${PORTSDIR}/graphics/ocaml-images \
- kpsewhich:${PORTSDIR}/print/teTeX-base
+RUN_DEPENDS= ${CI_DEPEND}:${PORTSDIR}/graphics/ocaml-images \
+ kpsewhich:${PORTSDIR}/print/teTeX-base \
+ hevea:${PORTSDIR}/textproc/hevea \
+ htmlc:${PORTSDIR}/textproc/htmlc
+BUILD_DEPENDS= ocamlfind:${PORTSDIR}/devel/ocaml-findlib \
+ ${CI_DEPEND}:${PORTSDIR}/graphics/ocaml-images \
+ kpsewhich:${PORTSDIR}/print/teTeX-base \
+ hevea:${PORTSDIR}/textproc/hevea \
+ htmlc:${PORTSDIR}/textproc/htmlc
+
LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
png.5:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS= kpsewhich:${PORTSDIR}/print/teTeX-base
USE_OCAML= yes
NO_OCAML_RUNDEPENDS=yes
@@ -31,20 +37,28 @@
USE_FREETYPE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-ALL_TARGET= opt
-INSTALL_TARGET= installopt installman
-CI_DEPEND= ${LOCALBASE}/${OCAML_LIBDIR}/camlimages/ci_core.a
+CONFIGURE_ARGS= --includedir=${LOCALBASE}/include --without-lablgtk --without-lablgtk2
+
+CI_DEPEND= ${LOCALBASE}/${OCAML_LIBDIR}/site-lib/camlimages/camlimages_core.a
MAN1= advi.1
+TEXDIR= ${LOCALBASE}/share/texmf/tex/latex/advi
post-extract:
- @${REINPLACE_CMD} -E \
- -e 's,^(COPTIONS[[:space:]]*=).*,\1-ccopt "${CFLAGS}",' \
- -e 's,^(COPTOPTIONS[[:space:]]*=).*,\1-ccopt "${CFLAGS}",' \
- -e 's,^(X11_INCLUDES[[:space:]]*=).*,\1-I${LOCALBASE}/include,' \
- -e 's,install -m 644,\$${BSD_INSTALL_DATA},' \
- -e 's,install -m 755,\$${BSD_INSTALL_PROGRAM},' \
- -e 's,^LIBRARIES = graphics,LIBRARIES =,' \
- ${WRKSRC}/Makefile
+ @${CP} ${LOCALBASE}/lib/hevea/hevea.sty ${WRKSRC}/doc
+ @${REINPLACE_CMD} -Ee 's/<\$$HOSTNAME>/${HOST}/g' "${WRKSRC}/doc/includes/bottomofpage-eng.htm"
+ @${REINPLACE_CMD} -Ee 's/<\$$USER>/${USER}/g' "${WRKSRC}/doc/includes/bottomofpage-eng.htm"
+ @${REINPLACE_CMD} -Ee 's/<\$$HOSTNAME>/${HOST}/g' "${WRKSRC}/doc/includes/basdepage-fra.htm"
+ @${REINPLACE_CMD} -Ee 's/<\$$USER>/${USER}/g' "${WRKSRC}/doc/includes/basdepage-fra.htm"
+
+do-install:
+ @${INSTALL_PROGRAM} ${WRKSRC}/src/advi ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+ @${INSTALL_MAN} ${WRKSRC}/doc/advi.1 ${PREFIX}/man/man1
+.endif
+ @${MKDIR} ${TEXDIR}
+ @${INSTALL_DATA} ${WRKSRC}/tex/*.sty ${TEXDIR}
+ @${INSTALL_DATA} ${WRKSRC}/tex/*.eps ${TEXDIR}
+ @${INSTALL_DATA} ${WRKSRC}/tex/*.def ${TEXDIR}
.include <bsd.port.mk>
--- Makefile.diff ends here ---
--- distinfo.diff begins here ---
--- distinfo.orig 2006-08-14 09:14:29.000000000 -0700
+++ distinfo 2010-03-14 18:38:57.000000000 -0700
@@ -1,3 +1,3 @@
-MD5 (advi-1.6.0.tgz) = da0e71cbc99a8def27873d4f3c756fa6
-SHA256 (advi-1.6.0.tgz) = ab77eb986987b4e6750e07e3a90f6bf58bea173eaeb2b1ebb0680d7545553e6b
-SIZE (advi-1.6.0.tgz) = 11436152
+MD5 (advi-1.9.tar.gz) = 42fe60dc65eb3048d0fb4789db1ca05c
+SHA256 (advi-1.9.tar.gz) = fc1ce772b3ebc3f7cded12bd8b805108b71aac897bcf0f0d19f13b547c68b1f6
+SIZE (advi-1.9.tar.gz) = 8512355
--- distinfo.diff ends here ---
--- files.diff begins here ---
diff -urN files.orig/patch-configure files/patch-configure
--- files.orig/patch-configure 1969-12-31 16:00:00.000000000 -0800
+++ files/patch-configure 2010-03-15 01:03:01.000000000 -0700
@@ -0,0 +1,54 @@
+--- configure.orig 2010-03-14 19:26:13.000000000 -0700
++++ configure 2010-03-15 01:02:57.000000000 -0700
+@@ -6481,10 +6481,37 @@
+ { echo "$as_me:$LINENO: result: $HEVEA" >&5
+ echo "${ECHO_T}$HEVEA" >&6; }
+ else
+- { echo "$as_me:$LINENO: result: no" >&5
++ {
++ echo "$as_me:$LINENO: result: no" >&5
++HEVEA= "false"
++HAVE_CAMLIMAGES= "false"
+ echo "${ECHO_T}no" >&6; }
+ fi
+
++CAML=ocaml
++CAMLDIR=`"$CAML"c -v | grep "^Standard" | sed "s/.*: *//"`
++
++echo "$as_me:$LINENO: result: version $OCAMLVERSION at $CAMLDIR" >&5
++
++LABLTKDIR=$CAMLDIR/labltk
++
++echo "$as_me:$LINENO: checking for labltk" >&5
++echo $ECHO_N "checking for labltk... $ECHO_C" >&6
++
++if test -f $LABLTKDIR/cTk.cmi; then
++ echo "$as_me:$LINENO: result: found" >&5
++echo "${ECHO_T}found" >&6
++ HAVE_LABLTK="true"
++ LABLTKLIB=$LABLTKDIR/labltk.cma
++else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++ HAVE_LABLTK="false"
++ echo "***************** Warning *******************"
++ echo "Your labltk library is too old. Use the latest one,"
++ echo "found in the O'Caml CVS tree"
++ echo "*******************************************"
++fi
+
+ if test -z "$HEVEA"; then
+ { echo "$as_me:$LINENO: WARNING: hevea not found, you won't be able to rebuild documention" >&5
+@@ -6726,6 +6753,12 @@
+
+ ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile doc/pngs/Makefile tex/Makefile"
+
++if test -d $texdir/tex/latex; then
++ ADVI_LOC=$texdir/tex/latex/advi
++else
++ echo "$as_me: error: no TeX root path found, check your setup" >&2;
++fi
++
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
diff -urN files.orig/patch-grY11.c files/patch-grY11.c
--- files.orig/patch-grY11.c 2006-08-14 09:14:29.000000000 -0700
+++ files/patch-grY11.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,11 +0,0 @@
---- grY11.c.orig Sun Aug 13 01:16:56 2006
-+++ grY11.c Sun Aug 13 01:17:06 2006
-@@ -473,7 +473,7 @@
- return Val_unit;
- }
-
--value caml_gr_resize_window (value wid, value w, value h)
-+value caml_gr_resize_window1 (value wid, value w, value h)
- {
- Window win;
-
diff -urN files.orig/patch-graphicsY11.ml files/patch-graphicsY11.ml
--- files.orig/patch-graphicsY11.ml 2006-08-14 09:14:29.000000000 -0700
+++ files/patch-graphicsY11.ml 1969-12-31 16:00:00.000000000 -0800
@@ -1,11 +0,0 @@
---- graphicsY11.ml.orig Sun Aug 13 01:17:58 2006
-+++ graphicsY11.ml Sun Aug 13 01:18:03 2006
-@@ -109,7 +109,7 @@
- = "caml_gr_move_window";;
-
- external raw_resize_window : window_id -> int -> int -> unit
-- = "caml_gr_resize_window";;
-+ = "caml_gr_resize_window1";;
-
- let resize_subwindow wid height width =
- if wid != null_window then begin
--- files.diff ends here ---
--- pkg-plist.diff begins here ---
--- pkg-plist.orig 2006-08-14 09:14:29.000000000 -0700
+++ pkg-plist 2010-03-14 22:58:36.000000000 -0700
@@ -8,10 +8,7 @@
share/texmf/tex/latex/advi/bar.eps
share/texmf/tex/latex/advi/bubble.sty
share/texmf/tex/latex/advi/caml.eps
-share/texmf/tex/latex/advi/jpfonts.conf
-share/texmf/tex/latex/advi/scratch_draw_splash.dvi
-share/texmf/tex/latex/advi/scratch_write_splash.dvi
-share/texmf/tex/latex/advi/splash.dvi
+share/texmf/tex/latex/advi/pgfsys-dvips.def
share/texmf/tex/latex/advi/superpose.sty
share/texmf/tex/latex/advi/xwindows-colors.sty
@dirrm share/texmf/tex/latex/advi
--- pkg-plist.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?877hp7n143.wl>