Attachment 67368 Details for Bug 99302 – file.diff

[patch] file.diff

file.diff (text/plain), 2.86 KB, created by Tarc on 2006-06-22 16:30:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tarc

Created: 2006-06-22 16:30:27 UTC

Size: 2.86 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/cvsup/Makefile,v
>retrieving revision 1.64
>diff -d -u -r1.64 Makefile
>--- Makefile    17 Dec 2005 06:17:29 -0000      1.64
>+++ Makefile    22 Jun 2006 14:51:53 -0000
>@@ -6,25 +6,36 @@
> #
> 
> PORTNAME=      cvsup
>-PORTVERSION?=  16.1h
>-PORTREVISION?= 2
>+PORTVERSION=   16.1h
>+PORTREVISION=  2
> CATEGORIES=    net devel
> MASTER_SITES=  ${MASTER_SITE_FREEBSD_ORG}
> MASTER_SITE_SUBDIR=development/CVSup/snapshots
> DISTNAME=      cvsup-snap-${PORTVERSION}
> 
> MAINTAINER=    jdp@FreeBSD.org
>-COMMENT?=      General network file distribution system optimized for CVS (GUI version)
>+COMMENT=       Distribution system optimized for CVS
> 
> CONFLICTS?=    cvsup-without-gui-[0-9]*
> ONLY_FOR_ARCHS=        alpha amd64 i386 sparc64
> 
>+OPTIONS=       STATIC "Build static distribution" off \
>+               X11 "Build with X11 support" on
>+
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 410000
> BROKEN=                Not supported on versions earlier than 4.1-RELEASE
> .endif
> 
>+.if defined(STATIC)
>+WITH_STATIC=YES
>+.endif
>+
>+.if defined(WITH_STATIC) && ! defined (WITHOUT_STATIC)
>+M3FLAGS+=      -DSTATIC
>+.endif
>+
> .if ${ARCH} == "alpha"
> TARGET=                FBSD_ALPHA
> .elif ${ARCH} == "amd64"
>@@ -41,13 +52,14 @@
> M3FLAGS+=      -DNOGUI
> BUILD_DEPENDS= ${PREFIX}/lib/m3/pkg/tcp/${TARGET}/libm3tcp.a:${PORTSDIR}/lang/ezm3
> PKGNAMESUFFIX= -without-gui
>-COMMENT=       General network file distribution system optimized for CVS (non-GUI version)
>+COMMENT+=      (non-GUI version)
> DESCR=         ${PKGDIR}/pkg-descr.nogui
> .if !defined(WITHOUT_X11) && ${ARCH} == "amd64"
> NO_LATEST_LINK=        yes
> .endif
> .else
> USE_XLIB=      yes
>+COMMENT+=      (GUI version)
> BUILD_DEPENDS= ${PREFIX}/lib/m3/pkg/formsvbt/${TARGET}/libm3formsvbt.a:${PORTSDIR}/lang/ezm3
> .endif
> 
>@@ -62,25 +74,13 @@
>        @${ECHO_MSG} "* STATIC.                                           *"
>        @${ECHO_MSG} "*****************************************************"
>        @${ECHO_MSG} ""
>+WITH_STATIC=YES
> .endif
>-
>-.ifdef STATIC || WITH_STATIC
>-M3FLAGS+=      -DSTATIC
>-.endif
>-
>-pre-fetch:
>-.ifndef WITHOUT_X11
>-.if ${ARCH} == "amd64"
>+.if defined(WITH_X11) && ${ARCH} == "amd64"
>        @${ECHO_MSG} "*****************************************************"
>        @${ECHO_MSG} "* CVSup with X11 is not yet supported on amd64.     *"
>        @${ECHO_MSG} "* I will build cvsup without X11 support now.       *"
>        @${ECHO_MSG} "*****************************************************"
>-.else
>-       @${ECHO_MSG} "*****************************************************"
>-       @${ECHO_MSG} "* To build CVSup without X11 (and without the GUI)  *"
>-       @${ECHO_MSG} "* use the \"net/cvsup-without-gui\" port.             *"
>-       @${ECHO_MSG} "*****************************************************"
>-.endif
> .endif
> 
> pre-patch:

Actions: View | Diff

Attachments on bug 99302: 67368