diff options
Diffstat (limited to 'net/unison240')
| -rw-r--r-- | net/unison240/Makefile | 54 | ||||
| -rw-r--r-- | net/unison240/distinfo | 11 | ||||
| -rw-r--r-- | net/unison240/files/patch-mkProjectInfo.ml | 11 | ||||
| -rw-r--r-- | net/unison240/files/patch-uigtk2.ml | 6 | ||||
| -rw-r--r-- | net/unison240/pkg-plist | 11 |
5 files changed, 49 insertions, 44 deletions
diff --git a/net/unison240/Makefile b/net/unison240/Makefile index 2ff07c8f6a9b..dcd1f225dca3 100644 --- a/net/unison240/Makefile +++ b/net/unison240/Makefile @@ -1,11 +1,7 @@ PORTNAME= unison PORTVERSION= 2.40.128 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net -MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ -DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} -DIST_SUBDIR= ${DISTNAME} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= madpilot@FreeBSD.org COMMENT= User-level file synchronization tool @@ -14,23 +10,27 @@ WWW= https://www.cis.upenn.edu/~bcpierce/unison/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING +VERSIONSUFFIX= 240 + +DEPRECATED= Legacy release unsupported by upstream +EXPIRATION_DATE= 2026-02-28 + FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} -VERSIONSUFFIX= 240 - nox11_PKGNAMESUFFIX= ${VERSIONSUFFIX}-nox11 nox11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX} -x11_PKGNAMESUFFIX= ${VERSIONSUFFIX} -x11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX}-nox11 -x11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \ - icotool:graphics/icoutils +x11_PKGNAMESUFFIX= ${VERSIONSUFFIX} +x11_BUILD_DEPENDS= icotool:graphics/icoutils \ + lablgtk2:x11-toolkits/ocaml-lablgtk2 x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 - -PLIST_SUB= PORTVERSION=${PORTVERSION} -USES= gmake ocaml:build +x11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX}-nox11 +USES= gmake ocaml:build +USE_GITHUB= yes +GH_ACCOUNT= bcpierce00 +GH_TAGNAME= 2.40 MAKE_ARGS= CFLAGS="" ALL_TARGET= unison all @@ -38,23 +38,26 @@ TEST_TARGET= selftest DOCS= BUGS.txt NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} -EXTRA_DOCS= ${DISTNAME}-manual.html \ - ${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps -OPTIONS_DEFINE= DOCS +WRKSRC_SUBDIR= src + +PLIST_SUB= PORTVERSION=${PORTVERSION} \ + VERSIONSUFFIX=${VERSIONSUFFIX} .if ${FLAVOR} == nox11 -MAKE_ARGS+= UISTYLE=text -PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 -PLIST_SUB+= X11="@comment " +MAKE_ARGS+= UISTYLE=text +PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 +PLIST_SUB+= X11="@comment " .else -MAKE_ARGS+= UISTYLE=gtk2 -SUB_FILES= ${PORTNAME}.desktop -USE_GNOME+= atk cairo gdkpixbuf glib20 gtk20 pango -USES+= gettext-runtime gnome -PLIST_SUB+= X11="" +MAKE_ARGS+= UISTYLE=gtk2 +SUB_FILES= ${PORTNAME}.desktop +USE_GNOME+= atk cairo gdkpixbuf glib20 gtk20 pango +USES+= gettext-runtime gnome +PLIST_SUB+= X11="" .endif +OPTIONS_DEFINE= DOCS + .include <bsd.port.options.mk> .if ${ARCH} == powerpc @@ -86,6 +89,5 @@ do-install: do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} - cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/net/unison240/distinfo b/net/unison240/distinfo index 8087893f14e9..4a61c58373ca 100644 --- a/net/unison240/distinfo +++ b/net/unison240/distinfo @@ -1,8 +1,3 @@ -SHA256 (unison-2.40.128/unison-2.40.128.tar.gz) = 5a1ea828786b9602f2a42c2167c9e7643aba2c1e20066be7ce46de4779a5ca54 -SIZE (unison-2.40.128/unison-2.40.128.tar.gz) = 2717593 -SHA256 (unison-2.40.128/unison-2.40.128-manual.html) = 8cd3901dffab27203fab1702a7eb25555539f1b566ebe08036aef695f39e8593 -SIZE (unison-2.40.128/unison-2.40.128-manual.html) = 267099 -SHA256 (unison-2.40.128/unison-2.40.128-manual.pdf) = 346f8d027adfafc9b042c8d4a144b6f0619cce43fa551dc3d4318a15464cd86a -SIZE (unison-2.40.128/unison-2.40.128-manual.pdf) = 496593 -SHA256 (unison-2.40.128/unison-2.40.128-manual.ps) = 6104e45e4b6c80c03fa17c2aa02a176e95574b731c58a5d8e2d13aa9387d0537 -SIZE (unison-2.40.128/unison-2.40.128-manual.ps) = 753150 +TIMESTAMP = 1763914825 +SHA256 (bcpierce00-unison-2.40.128-2.40_GH0.tar.gz) = 7e8ed59b1ceacc67fdfb5c585dbefd12cb81d8da8b338ac3e105867553b135cd +SIZE (bcpierce00-unison-2.40.128-2.40_GH0.tar.gz) = 3438271 diff --git a/net/unison240/files/patch-mkProjectInfo.ml b/net/unison240/files/patch-mkProjectInfo.ml new file mode 100644 index 000000000000..107131fe8dbf --- /dev/null +++ b/net/unison240/files/patch-mkProjectInfo.ml @@ -0,0 +1,11 @@ +--- mkProjectInfo.ml.orig 2014-12-30 02:21:28 UTC ++++ mkProjectInfo.ml +@@ -42,7 +42,7 @@ let pointVersionOrigin = 409 (* Revision that correspo + (* ---------------------------------------------------------------------- *) + (* You shouldn't need to edit below. *) + +-let revisionString = "$Rev$";; ++let revisionString = "$Rev: 537 $";; + + (* BCP (1/10): This bit was added to help with getting Unison via bazaar, but it + was never used much and I'm not confident it's working. I'll comment it out diff --git a/net/unison240/files/patch-uigtk2.ml b/net/unison240/files/patch-uigtk2.ml index 3fcc653c3fac..2e6839e8b480 100644 --- a/net/unison240/files/patch-uigtk2.ml +++ b/net/unison240/files/patch-uigtk2.ml @@ -1,6 +1,6 @@ ---- uigtk2.ml.orig 2009-05-14 15:59:33 UTC +--- uigtk2.ml.orig 2014-12-30 02:21:28 UTC +++ uigtk2.ml -@@ -93,12 +93,12 @@ let fontMonospaceMediumPango = lazy (Pango.Font.from_s +@@ -89,12 +89,12 @@ let icon = (* This does not work with the current version of Lablgtk, due to a bug let icon = GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true @@ -14,4 +14,4 @@ + (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); p - (********************************************************************* + let leftPtrWatch = diff --git a/net/unison240/pkg-plist b/net/unison240/pkg-plist index 98271524e6e7..b28583a61db5 100644 --- a/net/unison240/pkg-plist +++ b/net/unison240/pkg-plist @@ -1,10 +1,7 @@ -bin/unison240 -%%X11%%bin/unison240-text -%%X11%%share/applications/unison240.desktop -%%X11%%share/pixmaps/unison240.png +bin/unison%%VERSIONSUFFIX%% +%%X11%%bin/unison%%VERSIONSUFFIX%%-text +%%X11%%share/applications/unison%%VERSIONSUFFIX%%.desktop +%%X11%%share/pixmaps/unison%%VERSIONSUFFIX%%.png %%PORTDOCS%%%%DOCSDIR%%/BUGS.txt %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.html -%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.pdf -%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.ps |