pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/cvs Convert to options framework.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d00a1ad0ead
branches:  trunk
changeset: 494910:8d00a1ad0ead
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue May 31 21:28:22 2005 +0000

description:
Convert to options framework.

diffstat:

 devel/cvs/Makefile   |  40 ++++------------------------------------
 devel/cvs/options.mk |  36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 36 deletions(-)

diffs (98 lines):

diff -r 84289ba6f0df -r 8d00a1ad0ead devel/cvs/Makefile
--- a/devel/cvs/Makefile        Tue May 31 21:15:06 2005 +0000
+++ b/devel/cvs/Makefile        Tue May 31 21:28:22 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2005/04/19 12:39:18 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2005/05/31 21:28:22 wiz Exp $
 #
 
 DISTNAME=      cvs-1.11.20
@@ -16,45 +16,13 @@
 
 GNU_CONFIGURE= yes
 
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=           USE_INET6
-
-.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS]) && \
-    empty(MACHINE_PLATFORM:MSunOS-5.[89]-*) && \
-    empty(MACHINE_PLATFORM:MSunOS-5.10-*) && \
-    empty(MACHINE_PLATFORM:MLinux-*) && \
-    defined(NOT_YET_AVAILABLE_FOR_CVS_1_11_20)
-CONFIGURE_ARGS+=       --enable-ipv6
-PATCH_SITES=           ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=            cvs-1.11.19-v6-20050205.diff.gz
-PATCH_DIST_STRIP=      -p1
-.else
-CONFIGURE_ARGS+=       --disable-ipv6
-.endif
-
-.if defined(KERBEROS)
-.  include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-encryption
-CONFIGURE_ARGS+=       --with-gssapi=${KRB5BASE}
-CONFIGURE_ARGS+=       --with-krb4=${KRB5BASE}
-.  if ${OPSYS} == "Darwin"
-LDFLAGS+=              -framework Kerberos
-.  endif
-.else
-CONFIGURE_ARGS+=       --without-gssapi
-.endif
-
-.if defined(RCS_LOCALID)
-pre-fetch:
-       @${ECHO} RCS_LOCALID is now replaced by the tag variable in CVSROOT/config.
-.endif
+.include "options.mk"
 
 CONFIGURE_ENV+=        perl_path=${PERL5}
 
 INFO_FILES=    cvs.info cvsclient.info
-USE_MAKEINFO=          yes
-TEXINFO_REQD?=         4.0
+USE_MAKEINFO=  yes
+TEXINFO_REQD?= 4.0
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 84289ba6f0df -r 8d00a1ad0ead devel/cvs/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cvs/options.mk      Tue May 31 21:28:22 2005 +0000
@@ -0,0 +1,36 @@
+# $NetBSD: options.mk,v 1.1 2005/05/31 21:28:22 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.cvs
+PKG_SUPPORTED_OPTIONS= kerberos
+
+.include "../../mk/bsd.prefs.mk"
+
+.if empty(MACHINE_PLATFORM:MSunOS-5.[89]-*) && \
+    empty(MACHINE_PLATFORM:MSunOS-5.10-*) && \
+    empty(MACHINE_PLATFORM:MLinux-*) && \
+    defined(NOT_YET_AVAILABLE_FOR_CVS_1_11_20)
+PKG_SUPPORTED_OPTIONS+=        inet6
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --enable-ipv6
+PATCH_SITES=           ftp://ftp.kame.net/pub/kame/misc/
+PATCHFILES=            cvs-1.11.19-v6-20050205.diff.gz
+PATCH_DIST_STRIP=      -p1
+.else
+CONFIGURE_ARGS+=       --disable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mkerberos)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-encryption
+CONFIGURE_ARGS+=       --with-gssapi=${KRB5BASE}
+CONFIGURE_ARGS+=       --with-krb4=${KRB5BASE}
+.  if ${OPSYS} == "Darwin"
+LDFLAGS+=              -framework Kerberos
+.  endif
+.else
+CONFIGURE_ARGS+=       --without-gssapi
+.endif



Home | Main Index | Thread Index | Old Index