ports/76610: [PATCH] net/unison: update to 2.10.2
Alexander S. Usov
usov at kvi.nl
Sun Jan 23 22:40:22 UTC 2005
>Number: 76610
>Category: ports
>Synopsis: [PATCH] net/unison: update to 2.10.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: Sun Jan 23 22:40:21 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Alexander S. Usov
>Release: FreeBSD 5.3-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD kvip88.kvi.nl 5.3-RELEASE-p4 FreeBSD 5.3-RELEASE-p4 #0: Sat Jan 15 21:26:38 CET 2005
>Description:
- Update to 2.10.2
- Added a knob to compile with gtk2 gui.
- Together with a gui-enbled version install text-only binary too.
Added file(s):
- files/patch-pty.c
- pkg-message
Removed file(s):
- files/ocaml-external-patch-ab
Port maintainer (daniel+unison at pelleg.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- unison-2.10.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/unison/Makefile /home/usov/local/unison/Makefile
--- /usr/ports/net/unison/Makefile Fri Jul 30 14:52:15 2004
+++ /home/usov/local/unison/Makefile Sun Jan 23 21:36:25 2005
@@ -6,13 +6,12 @@
#
PORTNAME= unison
-PORTVERSION= 2.9.20
-PORTREVISION= 2
+PORTVERSION= 2.10.2
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/${DIST_SUBDIR}/
DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS}
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY= src.tar.gz
+EXTRACT_ONLY= unison-2.10.2.tar.gz
MAINTAINER= daniel+unison at pelleg.org
COMMENT= A user-level file synchronization tool
@@ -21,30 +20,58 @@
PATCH_DEPENDS= ${BUILD_DEPENDS}
USE_GMAKE= yes
-MAKE_ARGS= UISTYLE=text CFLAGS=""
+MAKE_ARGS= CFLAGS=""
+#MAKE_ARGS= UISTYLE=text CFLAGS=""
+
+.include <bsd.port.pre.mk>
.if !defined(NOPORTDOCS)
DOCS= BUGS.txt NEWS README
-EXTRA_DOCS= unison-manual.dvi unison-manual.html \
- unison-manual.pdf unison-manual.ps
+EXTRA_DOCS= unison-2.10.2-manual.html \
+ unison-2.10.2-manual.pdf unison-2.10.2-manual.ps
+.endif
+
+.if !defined(WITHOUT_GTK2) && exists(${LOCALBASE}/bin/lablgtk2)
+WITH_GTK2= yes
+.endif
+
+.if defined(WITH_GTK2)
+MAKE_ARGS+= UISTYLE=gtk2
+RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+PLIST_SUB+= TEXT=""
+.else
+MAKE_ARGS+= UISTYLE=text
+PLIST_SUB+= TEXT="@comment "
+.endif
+
+.if defined(WITH_GTK2)
+post-build:
+ @${ECHO} Building text-only version
+ @${ECHO} ${WRKSRC}
+ @${GMAKE} -C ${WRKSRC} UISTYLE=text NAME=unison-text
.endif
-pre-patch:
- @if [ `ocamlc -version | ${SED} -e s/\\\.//g -e s/\\\+.*//` -gt 307 ] ; then \
- if ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/ocaml-external-patch-ab ; then \
- ${TRUE} ; \
- else \
- ${ECHO_MSG} ">> Patch ocaml-external-patch-ab failed to apply cleanly." ; \
- ${FALSE} ; \
- fi; \
- fi
+#pre-patch:
+# @if [ `ocamlc -version | ${SED} -e s/\\\.//g -e s/\\\+.*//` -gt 307 ] ; then \
+# if ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/ocaml-external-patch-ab ; then \
+# ${TRUE} ; \
+# else \
+# ${ECHO_MSG} ">> Patch ocaml-external-patch-ab failed to apply cleanly." ; \
+# ${FALSE} ; \
+# fi; \
+# fi
post-install:
@${STRIP_CMD} ${PREFIX}/bin/unison
+.if defined(WITH_GTK2)
+ @${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin
+.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR}
.endif
+ @${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/net/unison/distinfo /home/usov/local/unison/distinfo
--- /usr/ports/net/unison/distinfo Wed Mar 31 05:10:20 2004
+++ /home/usov/local/unison/distinfo Sun Jan 23 18:28:36 2005
@@ -1,10 +1,8 @@
-MD5 (unison-2.9.20/src.tar.gz) = a0a1b734e11212623bc6ea996aace960
-SIZE (unison-2.9.20/src.tar.gz) = 363079
-MD5 (unison-2.9.20/unison-manual.dvi) = 9d51f63ad9b592f4e94f593f682b4533
-SIZE (unison-2.9.20/unison-manual.dvi) = 248060
-MD5 (unison-2.9.20/unison-manual.html) = babc84fe1729382c9569a7cc0dfd7851
-SIZE (unison-2.9.20/unison-manual.html) = 209167
-MD5 (unison-2.9.20/unison-manual.pdf) = 4f85a8fb7c2587d5f8e8184b49d90636
-SIZE (unison-2.9.20/unison-manual.pdf) = 332136
-MD5 (unison-2.9.20/unison-manual.ps) = db69ed340c6e88a56890ef37804ee3ed
-SIZE (unison-2.9.20/unison-manual.ps) = 440361
+MD5 (unison-2.10.2/unison-2.10.2.tar.gz) = a93cf03d4221ab6bab8b758b0325a9d5
+SIZE (unison-2.10.2/unison-2.10.2.tar.gz) = 458032
+MD5 (unison-2.10.2/unison-2.10.2-manual.html) = 46cac2b5b84e821d39cc5a100dd97e7a
+SIZE (unison-2.10.2/unison-2.10.2-manual.html) = 190911
+MD5 (unison-2.10.2/unison-2.10.2-manual.pdf) = 7e6b018d758b786d7cf5752413c08168
+SIZE (unison-2.10.2/unison-2.10.2-manual.pdf) = 354402
+MD5 (unison-2.10.2/unison-2.10.2-manual.ps) = 89cc36cf06d688f163a924fc8c1a47f9
+SIZE (unison-2.10.2/unison-2.10.2-manual.ps) = 490966
diff -ruN --exclude=CVS /usr/ports/net/unison/files/ocaml-external-patch-ab /home/usov/local/unison/files/ocaml-external-patch-ab
--- /usr/ports/net/unison/files/ocaml-external-patch-ab Fri Jul 30 14:52:16 2004
+++ /home/usov/local/unison/files/ocaml-external-patch-ab Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
---- ubase/uprintf.ml.orig Thu Jul 29 22:50:35 2004
-+++ ubase/uprintf.ml Thu Jul 29 22:51:55 2004
-@@ -10,8 +10,8 @@
- (* *)
- (***********************************************************************)
-
--external format_int: string -> int -> string = "format_int"
--external format_float: string -> float -> string = "format_float"
-+external format_int: string -> int -> string = "caml_format_int"
-+external format_float: string -> float -> string = "caml_format_float"
-
- let fprintf outchan doafter format =
- let format = (Obj.magic format : string) in
diff -ruN --exclude=CVS /usr/ports/net/unison/files/patch-pty.c /home/usov/local/unison/files/patch-pty.c
--- /usr/ports/net/unison/files/patch-pty.c Thu Jan 1 01:00:00 1970
+++ /home/usov/local/unison/files/patch-pty.c Sun Jan 23 20:05:57 2005
@@ -0,0 +1,13 @@
+--- pty.c.orig Sun Jan 23 19:55:28 2005
++++ pty.c Sun Jan 23 19:56:28 2005
+@@ -32,6 +32,10 @@
+ #ifdef __APPLE__
+ #include <util.h> // openpty
+ #endif
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <libutil.h>
++#endif
+
+ /* c_openpty: unit -> (int * Unix.file_descr) */
+ CAMLprim value c_openpty() {
diff -ruN --exclude=CVS /usr/ports/net/unison/pkg-message /home/usov/local/unison/pkg-message
--- /usr/ports/net/unison/pkg-message Thu Jan 1 01:00:00 1970
+++ /home/usov/local/unison/pkg-message Sun Jan 23 21:38:22 2005
@@ -0,0 +1,11 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ ATTENTION:
+
+1) Unison archive format has changed since 2.9.20. The old archive
+won't be deleted automatically in case you want to downgrade it.
+
+2) Merge functionality has seriously changed. Check the manual.
+
+3) Together with gtk-enabled version, a text-only unison-text binary
+is installed as it depends on a smaller number of libraries.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff -ruN --exclude=CVS /usr/ports/net/unison/pkg-plist /home/usov/local/unison/pkg-plist
--- /usr/ports/net/unison/pkg-plist Thu Oct 23 16:06:52 2003
+++ /home/usov/local/unison/pkg-plist Sun Jan 23 20:28:33 2005
@@ -1,9 +1,9 @@
bin/unison
+%%TEXT%%bin/unison-text
%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.dvi
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.ps
+%%PORTDOCS%%%%DOCSDIR%%/unison-2.10.2-manual.html
+%%PORTDOCS%%%%DOCSDIR%%/unison-2.10.2-manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/unison-2.10.2-manual.ps
%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- unison-2.10.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list