svn commit: r311872 - in head/devel/gcvs: . files

[Mikhail Teterin]

Author: mi
Date: Thu Feb  7 16:46:19 2013
New Revision: 311872
URL: http://svnweb.freebsd.org/changeset/ports/311872

Log:
  Do not extract/patch/build/install the pieces of cvs (version 1.10),
  which are provided by the base version 1.11 anyway. Trim pkg-plist and
  bump PORTREVISION yet again.
  
  Do not extract/patch/compile the functions (getopt/getopt_long/getline),
  which are provided by libc. This unbreaks the port, because it was
  the conflict in declaration of getline(3), which caused the breakage
  in the first place.

Deleted:
  head/devel/gcvs/files/patch-common_getopt.c
  head/devel/gcvs/files/patch-cvsunix-configure.in
  head/devel/gcvs/files/patch-cvsunix-lib-Makefile.in
  head/devel/gcvs/files/patch-cvsunix-lib-hostname.c
  head/devel/gcvs/files/patch-cvsunix-lib_regex.c
  head/devel/gcvs/files/patch-cvsunix-src-Makefile.in
Modified:
  head/devel/gcvs/Makefile
  head/devel/gcvs/pkg-plist

Modified: head/devel/gcvs/Makefile
==============================================================================
--- head/devel/gcvs/Makefile	Thu Feb  7 16:40:11 2013	(r311871)
+++ head/devel/gcvs/Makefile	Thu Feb  7 16:46:19 2013	(r311872)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcvs
 PORTVERSION=	1.0
-PORTREVISION=	13
+PORTREVISION=	14
 PORTEPOCH=	1
 CATEGORIES=	devel tk
 MASTER_SITES=	SF/cvsgui/gCvs/${PORTNAME}-${PORTVERSION}
@@ -13,8 +13,6 @@ COMMENT=	High-end interface client for C
 
 LICENSE=	GPLv2
 
-BROKEN=		Does not build
-
 USE_GNOME=	gtk12
 USE_TCL_BUILD=	yes
 USE_TCL_WRAPPER=yes
@@ -24,18 +22,20 @@ USE_AUTOTOOLS=	aclocal autoheader automa
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing --force --copy --gnu
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS:N-std=*:N:}"
+CXXFLAGS:=	${CXXFLAGS:N-std=*:N:}
 CONFIGURE_ARGS=	--with-tclinclude=${TCL_INCLUDEDIR} \
 		--with-tcllib=${TCL_LIBDIR}
 MAKE_JOBS_SAFE=	yes
+EXTRACT_AFTER_ARGS=|${TAR} -xpf -	\
+	--exclude cvsunix --exclude 'getline.[ch]' --exclude 'getopt*.[ch]'
 
-MAN1=		cvs.1
-MAN5=		cvs.5
-MAN8=		cvsbug.8
-INFO=		cvs cvsclient
-
-pre-configure:
-	@(cd ${WRKSRC}/cvsunix && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
-		${AUTOCONF_ARGS})
+post-patch:
+	${REINPLACE_CMD} -E '/get(line|opt1?)\.[ch]/d'	\
+		${WRKSRC}/common/Makefile.am
+	${FIND} ${WRKSRC} -name '*.c*' | ${XARGS} ${REINPLACE_CMD} -E	\
+		-e '/#include "getline\.h"/d' \
+		-e 's/"getopt\.h"/<getopt.h>/'
+	${REINPLACE_CMD} 's/cvsunix//g'	\
+		${WRKSRC}/Makefile.am ${WRKSRC}/configure.in
 
 .include <bsd.port.mk>

Modified: head/devel/gcvs/pkg-plist
==============================================================================
--- head/devel/gcvs/pkg-plist	Thu Feb  7 16:40:11 2013	(r311871)
+++ head/devel/gcvs/pkg-plist	Thu Feb  7 16:46:19 2013	(r311872)
@@ -1,24 +1,5 @@
-bin/cvs
-bin/cvsbug
 bin/cvstree
 bin/gcvs
-bin/rcs2log
-lib/cvs/contrib/README
-lib/cvs/contrib/clmerge
-lib/cvs/contrib/cln_hist
-lib/cvs/contrib/commit_prep
-lib/cvs/contrib/cvs2vendor
-lib/cvs/contrib/cvs_acls
-lib/cvs/contrib/cvscheck
-lib/cvs/contrib/cvscheck.man
-lib/cvs/contrib/intro.doc
-lib/cvs/contrib/log
-lib/cvs/contrib/log_accum
-lib/cvs/contrib/mfpipe
-lib/cvs/contrib/rcs-to-cvs
-lib/cvs/contrib/rcs2log
-lib/cvs/contrib/rcslock
-lib/cvs/contrib/sccs2rcs
 %%DATADIR%%/ChangeRoot.tcl
 %%DATADIR%%/ChangeRootTK.tcl
 %%DATADIR%%/Cleanup.tcl
@@ -88,5 +69,3 @@ lib/cvs/contrib/sccs2rcs
 %%DATADIR%%/startup.tcl
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
- at dirrm lib/cvs/contrib
- at dirrm lib/cvs