diff options
| author | madpilot <madpilot@FreeBSD.org> | 2013-11-07 22:51:01 +0000 |
|---|---|---|
| committer | madpilot <madpilot@FreeBSD.org> | 2013-11-07 22:51:01 +0000 |
| commit | 9ef92e6d19558522586ff1c161cf3adad3d568f0 (patch) | |
| tree | 8a279d2c2d1ecfc0a8f0b814f363812f67f00733 | |
| parent | 27d6ecbccb744255a5cc04307f2ac9bd26a78566 (diff) | |
| download | FreeBSD-ports-9ef92e6d19558522586ff1c161cf3adad3d568f0.zip FreeBSD-ports-9ef92e6d19558522586ff1c161cf3adad3d568f0.tar.gz | |
- Fix build with DOCS option disabled [1]
- Remove dependency on desktop-file-utils, we do not install MIME
types. [2]
PR: ports/183703 [1]
Submitted by: Me [1]
Noticed by: mandree [2]
| -rw-r--r-- | net/unison-devel/Makefile | 14 | ||||
| -rw-r--r-- | net/unison/Makefile | 14 |
2 files changed, 10 insertions, 18 deletions
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile index da8e0cca..5d35135 100644 --- a/net/unison-devel/Makefile +++ b/net/unison-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= unison PORTVERSION= 2.45.28 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ PKGNAMESUFFIX= -devel @@ -22,6 +22,10 @@ WANT_GNOME= yes MAKE_ARGS= CFLAGS="" CONFLICTS= unison-[0-9]* unison-nox11-[0-9]* +DOCS= BUGS.txt NEWS README +EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ + unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps + OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT= DOCS X11 @@ -30,12 +34,6 @@ ALL_TARGET= unison all .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MDOCS} -DOCS= BUGS.txt NEWS README -EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ - unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps -.endif - .if ${PORT_OPTIONS:MX11} MAKE_ARGS+= UISTYLE=gtk2 PLIST_SUB+= TEXT="" @@ -45,7 +43,6 @@ BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \ RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 PATCH_DEPENDS+= ${BUILD_DEPENDS} CONFLICTS+= ocaml-nox11* -USE_GNOME= desktopfileutils SUB_FILES+= ${PORTNAME}.desktop PLIST_FILES+= share/pixmaps/${PORTNAME}.png .else @@ -82,7 +79,6 @@ post-install: @${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DESKTOPDIR} @${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} - @-update-desktop-database > /dev/null @${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .endif diff --git a/net/unison/Makefile b/net/unison/Makefile index 91083b3..5f36204 100644 --- a/net/unison/Makefile +++ b/net/unison/Makefile @@ -3,7 +3,7 @@ PORTNAME= unison PORTVERSION= 2.40.102 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} @@ -24,17 +24,15 @@ CONFLICTS?= unison-devel-[0-9]* unison-nox11-[0-9]* MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all +DOCS= BUGS.txt NEWS README +EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ + unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps + OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT?= DOCS X11 .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MDOCS} -DOCS= BUGS.txt NEWS README -EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ - unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps -.endif - .if ${PORT_OPTIONS:MX11} MAKE_ARGS+= UISTYLE=gtk2 PLIST_SUB+= TEXT="" @@ -44,7 +42,6 @@ BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \ RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 PATCH_DEPENDS+= ${BUILD_DEPENDS} CONFLICTS+= ocaml-nox11* -USE_GNOME= desktopfileutils SUB_FILES+= ${PORTNAME}.desktop PLIST_FILES+= share/pixmaps/${PORTNAME}.png .else @@ -78,7 +75,6 @@ post-install: @${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DESKTOPDIR} @${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} - @-update-desktop-database > /dev/null @${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .endif |
