diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile index 39b19b064bfd..1a398c9e0243 100644 --- a/devel/gcvs/Makefile +++ b/devel/gcvs/Makefile @@ -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 CVS 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 automake autoconf 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"//' + ${REINPLACE_CMD} 's/cvsunix//g' \ + ${WRKSRC}/Makefile.am ${WRKSRC}/configure.in .include diff --git a/devel/gcvs/files/patch-common_getopt.c b/devel/gcvs/files/patch-common_getopt.c deleted file mode 100644 index 625c292a0aff..000000000000 --- a/devel/gcvs/files/patch-common_getopt.c +++ /dev/null @@ -1,11 +0,0 @@ ---- common/getopt.c.orig 2007-11-13 23:33:47.000000000 +0100 -+++ common/getopt.c 2007-11-13 23:34:27.000000000 +0100 -@@ -509,7 +509,7 @@ - const struct option *pfound = NULL; - int exact = 0; - int ambig = 0; -- int indfound; -+ int indfound = 0; - int option_index; - - for (nameend = nextchar; *nameend && *nameend != '='; nameend++) diff --git a/devel/gcvs/files/patch-cvsunix-configure.in b/devel/gcvs/files/patch-cvsunix-configure.in deleted file mode 100644 index e8378117ee0d..000000000000 --- a/devel/gcvs/files/patch-cvsunix-configure.in +++ /dev/null @@ -1,44 +0,0 @@ ---- cvsunix/configure.in.orig 2001-03-06 20:23:49.000000000 +0100 -+++ cvsunix/configure.in 2007-11-22 20:55:15.000000000 +0100 -@@ -178,7 +178,7 @@ - # the user's setting for LDFLAGS - hold_ldflags=$LDFLAGS - test -n "${krb_libdir}" && LDFLAGS="$LDFLAGS -L${krb_libdir}" -- AC_CHECK_LIB(des,printf,[LIBS="${LIBS} -ldes"]) -+ AC_CHECK_LIB(des,printf,[LIBS="${LIBS} -lcrypt"]) - LDFLAGS=$hold_ldflags - if test -n "$krb_incdir"; then - includeopt="${includeopt} -I$krb_incdir" -@@ -202,27 +202,22 @@ - - hold_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$GSSAPI/include " --AC_CHECK_HEADERS(krb5.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h) -+AC_CHECK_HEADERS(krb5.h gssapi/gssapi.h gssapi/gssapi_generic.h) - CPPFLAGS=$hold_cppflags - - if test "$ac_cv_header_krb5_h" = "yes" && -- (test "$ac_cv_header_gssapi_h" = "yes" || -- test "$ac_cv_header_gssapi_gssapi_h" = "yes"); then -+ test "$ac_cv_header_gssapi_gssapi_h" = "yes"; then - AC_DEFINE(HAVE_GSSAPI) - includeopt="${includeopt} -I$GSSAPI/include" - # FIXME: This is ugly, but these things don't seem to be standardized. - if test "$ac_cv_header_gssapi_h" = "yes"; then -- LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken" -+ LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err" - else -- LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err" -+ LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err" - fi - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-I$GSSAPI/include $CPPFLAGS" -- if test "$ac_cv_header_gssapi_h" = "yes"; then -- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE)) -- else -- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE)) -- fi -+ AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE)) - CPPFLAGS=$save_CPPFLAGS - # This is necessary on Irix 5.3, in order to link against libkrb5 -- - # there, an_to_ln.o refers to things defined only in -lgen. diff --git a/devel/gcvs/files/patch-cvsunix-lib-Makefile.in b/devel/gcvs/files/patch-cvsunix-lib-Makefile.in deleted file mode 100644 index c9a6c32a0123..000000000000 --- a/devel/gcvs/files/patch-cvsunix-lib-Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ ---- cvsunix/lib/Makefile.in.orig Thu Nov 7 19:29:36 2002 -+++ cvsunix/lib/Makefile.in Tue Jul 1 04:38:17 2003 -@@ -125,6 +125,7 @@ - CC = @CC@ - CXX = @CXX@ - CFLAGS = @CFLAGS@ -+CXXFLAGS = @CXXFLAGS@ - CPPFLAGS= - - YACC = @YACC@ -@@ -135,7 +136,7 @@ - - .cpp.o: - $(CXX) $(CPPFLAGS) -I.. -I$(srcdir) -I$(cvs_srcdir) \ -- $(DEFS) $(CFLAGS) -c $< -+ $(DEFS) $(CXXFLAGS) -c $< - - .SUFFIXES: - .SUFFIXES: .c .cpp .o .obj -@@ -200,6 +201,7 @@ - regex.o: regex.h - md5.o: md5.h - argmatch.o: cvsgui.h -+hostname.o: cvsgui.h - - xlint: - @echo xlint does nothing diff --git a/devel/gcvs/files/patch-cvsunix-lib-hostname.c b/devel/gcvs/files/patch-cvsunix-lib-hostname.c deleted file mode 100644 index da14a2e23ad6..000000000000 --- a/devel/gcvs/files/patch-cvsunix-lib-hostname.c +++ /dev/null @@ -1,15 +0,0 @@ ---- cvsunix/lib/hostname.c.orig Wed Nov 22 15:14:13 2006 -+++ cvsunix/lib/hostname.c Wed Nov 22 15:15:36 2006 -@@ -28,6 +28,7 @@ - - /* Put this host's name into NAME, using at most NAMELEN characters */ - -+#if 0 - int - gethostname(name, namelen) - char *name; -@@ -43,3 +44,4 @@ - - return (0); - } -+#endif diff --git a/devel/gcvs/files/patch-cvsunix-lib_regex.c b/devel/gcvs/files/patch-cvsunix-lib_regex.c deleted file mode 100644 index 7abc15e4cf02..000000000000 --- a/devel/gcvs/files/patch-cvsunix-lib_regex.c +++ /dev/null @@ -1,11 +0,0 @@ ---- cvsunix/lib/regex.c.orig 2007-11-22 20:19:42.000000000 +0100 -+++ cvsunix/lib/regex.c 2007-11-22 20:32:54.000000000 +0100 -@@ -4909,7 +4909,7 @@ - /* Compare that many; failure if mismatch, else move - past them. */ - if (RE_TRANSLATE_P (translate) -- ? bcmp_translate (d, d2, mcnt, translate) -+ ? bcmp_translate ((unsigned char *)d, (unsigned char *)d2, mcnt, translate) - : bcmp (d, d2, mcnt)) - goto fail; - d += mcnt, d2 += mcnt; diff --git a/devel/gcvs/files/patch-cvsunix-src-Makefile.in b/devel/gcvs/files/patch-cvsunix-src-Makefile.in deleted file mode 100644 index 8bd9c7a30379..000000000000 --- a/devel/gcvs/files/patch-cvsunix-src-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- cvsunix/src/Makefile.in.orig Sun Dec 22 16:59:11 2002 -+++ cvsunix/src/Makefile.in Wed Jan 15 04:57:13 2003 -@@ -91,7 +91,7 @@ - install: installdirs - @for prog in $(PROGS); do \ - echo Installing $$prog in $(bindir); \ -- $(INSTALL) $$prog $(bindir)/$$prog ; \ -+ $(INSTALL_PROGRAM) $$prog $(bindir)/$$prog ; \ - done - @for script in $(SCRIPTS); do \ - echo Installing $$script in $(bindir); \ diff --git a/devel/gcvs/pkg-plist b/devel/gcvs/pkg-plist index 957c0879082e..3dbb3c0af2eb 100644 --- a/devel/gcvs/pkg-plist +++ b/devel/gcvs/pkg-plist @@ -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%% -@dirrm lib/cvs/contrib -@dirrm lib/cvs