Attachment #72808 for bug #105749

View | Details | Raw Unified | Return to bug 105749
Collapse All | Expand All

Lines 7-13 Link Here

(-)/home/trasz/gcvs/Makefile (-3 / +1 lines)
7		7
8	PORTNAME= gcvs	8	PORTNAME= gcvs
9	PORTVERSION= 1.0	9	PORTVERSION= 1.0
10	PORTREVISION= 6	10	PORTREVISION= 7
11	PORTEPOCH= 1	11	PORTEPOCH= 1
12	CATEGORIES= devel tk84	12	CATEGORIES= devel tk84
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
Lines 18-25 Link Here
18		18
19	BUILD_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84	19	BUILD_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84
20	RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84	20	RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84
21
22	BROKEN= Does not build
23		21
24	USE_GETOPT_LONG=yes	22	USE_GETOPT_LONG=yes
25	USE_GNOME= gtk12	23	USE_GNOME= gtk12

Lines 1-11 Link Here

(-)/home/trasz/gcvs/files/patch-cvsunix-configure (-11 lines)
1	--- cvsunix/configure.orig Wed Mar 7 04:02:21 2001
2	+++ cvsunix/configure Mon Jan 21 16:24:32 2002
3	@@ -3423,7 +3423,7 @@
4	includeopt="${includeopt} -I$GSSAPI/include"
5	# FIXME: This is ugly, but these things don't seem to be standardized.
6	if test "$ac_cv_header_gssapi_h" = "yes"; then
7	- LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken"
8	+ LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err"
9	else
10	LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
11	fi




--- cvsunix/configure.in.orig	Wed Nov 22 16:09:07 2006
+++ cvsunix/configure.in	Wed Nov 22 16:10:02 2006
@@ -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"
@@ -212,7 +212,7 @@
   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"
   fi




--- 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




--- make_configure.orig	Thu Nov  7 19:42:00 2002
+++ make_configure	Wed Nov 22 15:07:42 2006
@@ -1,14 +1,4 @@
-aclocal
-autoheader
-
-list=`find . -name Makefile.am -exec dirname {} \;`
-
-for subdir in $list
-do
-	echo making $subdir/Makefile.in
 do
 	echo making $subdir/Makefile.in
-	automake --add-missing --gnu $subdir/Makefile
-done
-
 
-autoconf 
+cd cvsunix && autoreconf259
+cd ..
 
 ./configure $*




lib/cvs/contrib/sccs2rcs
@dirrm lib/cvs/contrib
@dirrm lib/cvs
%%DATADIR%%/ChangeRoot.tcl
%%DATADIR%%/ChangeRootTK.tcl
%%DATADIR%%/Cleanup.tcl
%%DATADIR%%/ColorTest.tcl
%%DATADIR%%/CvsAddAll.tcl
%%DATADIR%%/DocMacros.txt
%%DATADIR%%/EditSafely.tcl
%%DATADIR%%/FastModSearch.tcl
%%DATADIR%%/FolderTest.tcl
%%DATADIR%%/ForceUpdate.tcl
%%DATADIR%%/ListDeleted.tcl
%%DATADIR%%/ListLockedFiles.tcl
%%DATADIR%%/ListModules.tcl
%%DATADIR%%/ListNonCVS.tcl
%%DATADIR%%/ListStickyTags.tcl
%%DATADIR%%/PrepPatch.tcl
%%DATADIR%%/QueryState.tcl
%%DATADIR%%/RevertChanges.tcl
%%DATADIR%%/SelectionTest.tcl
%%DATADIR%%/SetCurrentVersion.tcl
%%DATADIR%%/TclVersion.tcl
%%DATADIR%%/cvs2cl.tcl
%%DATADIR%%/cvsignore_add.tcl
%%DATADIR%%/cvsignore_remove.tcl
%%DATADIR%%/startup.tcl
%%DATADIR%%/pixmaps/about.xpm
%%DATADIR%%/pixmaps/add.xpm
%%DATADIR%%/pixmaps/addb.xpm
%%DATADIR%%/pixmaps/addfile.xpm
%%DATADIR%%/pixmaps/binfile.xpm
%%DATADIR%%/pixmaps/branch.xpm
%%DATADIR%%/pixmaps/commit.xpm
%%DATADIR%%/pixmaps/conflict.xpm
%%DATADIR%%/pixmaps/cvsfile.xpm
%%DATADIR%%/pixmaps/delfile.xpm
%%DATADIR%%/pixmaps/diff.xpm
%%DATADIR%%/pixmaps/edit.xpm
%%DATADIR%%/pixmaps/error.xpm
%%DATADIR%%/pixmaps/explore.xpm
%%DATADIR%%/pixmaps/folder.xpm
%%DATADIR%%/pixmaps/foldign.xpm
%%DATADIR%%/pixmaps/foldmiss.xpm
%%DATADIR%%/pixmaps/foldunk.xpm
%%DATADIR%%/pixmaps/graph.xpm
%%DATADIR%%/pixmaps/ignfile.xpm
%%DATADIR%%/pixmaps/ignore.xpm
%%DATADIR%%/pixmaps/lock.xpm
%%DATADIR%%/pixmaps/log.xpm
%%DATADIR%%/pixmaps/missfile.xpm
%%DATADIR%%/pixmaps/modbin.xpm
%%DATADIR%%/pixmaps/modfile.xpm
%%DATADIR%%/pixmaps/release.xpm
%%DATADIR%%/pixmaps/reload.xpm
%%DATADIR%%/pixmaps/remove.xpm
%%DATADIR%%/pixmaps/status.xpm
%%DATADIR%%/pixmaps/stop.xpm
%%DATADIR%%/pixmaps/tag.xpm
%%DATADIR%%/pixmaps/trash.xpm
%%DATADIR%%/pixmaps/unedit.xpm
%%DATADIR%%/pixmaps/unkfile.xpm
%%DATADIR%%/pixmaps/unlock.xpm
%%DATADIR%%/pixmaps/untag.xpm
%%DATADIR%%/pixmaps/unwatch.xpm
%%DATADIR%%/pixmaps/update.xpm
%%DATADIR%%/pixmaps/upfolder.xpm
%%DATADIR%%/pixmaps/warning.xpm
%%DATADIR%%/pixmaps/watch.xpm
@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%

Return to bug 105749

Lines 21-92 Link Here

(-)/home/trasz/gcvs/pkg-plist (-69 / +69 lines)
21	lib/cvs/contrib/sccs2rcs	21	lib/cvs/contrib/sccs2rcs
22	@dirrm lib/cvs/contrib	22	@dirrm lib/cvs/contrib
23	@dirrm lib/cvs	23	@dirrm lib/cvs
24	share/gcvs/ChangeRoot.tcl	24	%%DATADIR%%/ChangeRoot.tcl
25	share/gcvs/ChangeRootTK.tcl	25	%%DATADIR%%/ChangeRootTK.tcl
26	share/gcvs/Cleanup.tcl	26	%%DATADIR%%/Cleanup.tcl
27	share/gcvs/ColorTest.tcl	27	%%DATADIR%%/ColorTest.tcl
28	share/gcvs/CvsAddAll.tcl	28	%%DATADIR%%/CvsAddAll.tcl
29	share/gcvs/DocMacros.txt	29	%%DATADIR%%/DocMacros.txt
30	share/gcvs/EditSafely.tcl	30	%%DATADIR%%/EditSafely.tcl
31	share/gcvs/FastModSearch.tcl	31	%%DATADIR%%/FastModSearch.tcl
32	share/gcvs/FolderTest.tcl	32	%%DATADIR%%/FolderTest.tcl
33	share/gcvs/ForceUpdate.tcl	33	%%DATADIR%%/ForceUpdate.tcl
34	share/gcvs/ListDeleted.tcl	34	%%DATADIR%%/ListDeleted.tcl
35	share/gcvs/ListLockedFiles.tcl	35	%%DATADIR%%/ListLockedFiles.tcl
36	share/gcvs/ListModules.tcl	36	%%DATADIR%%/ListModules.tcl
37	share/gcvs/ListNonCVS.tcl	37	%%DATADIR%%/ListNonCVS.tcl
38	share/gcvs/ListStickyTags.tcl	38	%%DATADIR%%/ListStickyTags.tcl
39	share/gcvs/PrepPatch.tcl	39	%%DATADIR%%/PrepPatch.tcl
40	share/gcvs/QueryState.tcl	40	%%DATADIR%%/QueryState.tcl
41	share/gcvs/RevertChanges.tcl	41	%%DATADIR%%/RevertChanges.tcl
42	share/gcvs/SelectionTest.tcl	42	%%DATADIR%%/SelectionTest.tcl
43	share/gcvs/SetCurrentVersion.tcl	43	%%DATADIR%%/SetCurrentVersion.tcl
44	share/gcvs/TclVersion.tcl	44	%%DATADIR%%/TclVersion.tcl
45	share/gcvs/cvs2cl.tcl	45	%%DATADIR%%/cvs2cl.tcl
46	share/gcvs/cvsignore_add.tcl	46	%%DATADIR%%/cvsignore_add.tcl
47	share/gcvs/cvsignore_remove.tcl	47	%%DATADIR%%/cvsignore_remove.tcl
48	share/gcvs/startup.tcl	48	%%DATADIR%%/startup.tcl
49	share/gcvs/pixmaps/about.xpm	49	%%DATADIR%%/pixmaps/about.xpm
50	share/gcvs/pixmaps/add.xpm	50	%%DATADIR%%/pixmaps/add.xpm
51	share/gcvs/pixmaps/addb.xpm	51	%%DATADIR%%/pixmaps/addb.xpm
52	share/gcvs/pixmaps/addfile.xpm	52	%%DATADIR%%/pixmaps/addfile.xpm
53	share/gcvs/pixmaps/binfile.xpm	53	%%DATADIR%%/pixmaps/binfile.xpm
54	share/gcvs/pixmaps/branch.xpm	54	%%DATADIR%%/pixmaps/branch.xpm
55	share/gcvs/pixmaps/commit.xpm	55	%%DATADIR%%/pixmaps/commit.xpm
56	share/gcvs/pixmaps/conflict.xpm	56	%%DATADIR%%/pixmaps/conflict.xpm
57	share/gcvs/pixmaps/cvsfile.xpm	57	%%DATADIR%%/pixmaps/cvsfile.xpm
58	share/gcvs/pixmaps/delfile.xpm	58	%%DATADIR%%/pixmaps/delfile.xpm
59	share/gcvs/pixmaps/diff.xpm	59	%%DATADIR%%/pixmaps/diff.xpm
60	share/gcvs/pixmaps/edit.xpm	60	%%DATADIR%%/pixmaps/edit.xpm
61	share/gcvs/pixmaps/error.xpm	61	%%DATADIR%%/pixmaps/error.xpm
62	share/gcvs/pixmaps/explore.xpm	62	%%DATADIR%%/pixmaps/explore.xpm
63	share/gcvs/pixmaps/folder.xpm	63	%%DATADIR%%/pixmaps/folder.xpm
64	share/gcvs/pixmaps/foldign.xpm	64	%%DATADIR%%/pixmaps/foldign.xpm
65	share/gcvs/pixmaps/foldmiss.xpm	65	%%DATADIR%%/pixmaps/foldmiss.xpm
66	share/gcvs/pixmaps/foldunk.xpm	66	%%DATADIR%%/pixmaps/foldunk.xpm
67	share/gcvs/pixmaps/graph.xpm	67	%%DATADIR%%/pixmaps/graph.xpm
68	share/gcvs/pixmaps/ignfile.xpm	68	%%DATADIR%%/pixmaps/ignfile.xpm
69	share/gcvs/pixmaps/ignore.xpm	69	%%DATADIR%%/pixmaps/ignore.xpm
70	share/gcvs/pixmaps/lock.xpm	70	%%DATADIR%%/pixmaps/lock.xpm
71	share/gcvs/pixmaps/log.xpm	71	%%DATADIR%%/pixmaps/log.xpm
72	share/gcvs/pixmaps/missfile.xpm	72	%%DATADIR%%/pixmaps/missfile.xpm
73	share/gcvs/pixmaps/modbin.xpm	73	%%DATADIR%%/pixmaps/modbin.xpm
74	share/gcvs/pixmaps/modfile.xpm	74	%%DATADIR%%/pixmaps/modfile.xpm
75	share/gcvs/pixmaps/release.xpm	75	%%DATADIR%%/pixmaps/release.xpm
76	share/gcvs/pixmaps/reload.xpm	76	%%DATADIR%%/pixmaps/reload.xpm
77	share/gcvs/pixmaps/remove.xpm	77	%%DATADIR%%/pixmaps/remove.xpm
78	share/gcvs/pixmaps/status.xpm	78	%%DATADIR%%/pixmaps/status.xpm
79	share/gcvs/pixmaps/stop.xpm	79	%%DATADIR%%/pixmaps/stop.xpm
80	share/gcvs/pixmaps/tag.xpm	80	%%DATADIR%%/pixmaps/tag.xpm
81	share/gcvs/pixmaps/trash.xpm	81	%%DATADIR%%/pixmaps/trash.xpm
82	share/gcvs/pixmaps/unedit.xpm	82	%%DATADIR%%/pixmaps/unedit.xpm
83	share/gcvs/pixmaps/unkfile.xpm	83	%%DATADIR%%/pixmaps/unkfile.xpm
84	share/gcvs/pixmaps/unlock.xpm	84	%%DATADIR%%/pixmaps/unlock.xpm
85	share/gcvs/pixmaps/untag.xpm	85	%%DATADIR%%/pixmaps/untag.xpm
86	share/gcvs/pixmaps/unwatch.xpm	86	%%DATADIR%%/pixmaps/unwatch.xpm
87	share/gcvs/pixmaps/update.xpm	87	%%DATADIR%%/pixmaps/update.xpm
88	share/gcvs/pixmaps/upfolder.xpm	88	%%DATADIR%%/pixmaps/upfolder.xpm
89	share/gcvs/pixmaps/warning.xpm	89	%%DATADIR%%/pixmaps/warning.xpm
90	share/gcvs/pixmaps/watch.xpm	90	%%DATADIR%%/pixmaps/watch.xpm
91	@dirrm share/gcvs/pixmaps	91	@dirrm %%DATADIR%%/pixmaps
92	@dirrm share/gcvs	92	@dirrm %%DATADIR%%

Line 0 Link Here

(-)/home/trasz/gcvs/files/patch-cvsunix-configure.in (+20 lines)
	1	--- cvsunix/configure.in.orig Wed Nov 22 16:09:07 2006
	2	+++ cvsunix/configure.in Wed Nov 22 16:10:02 2006
	3	@@ -178,7 +178,7 @@
	4	# the user's setting for LDFLAGS
	5	hold_ldflags=$LDFLAGS
	6	test -n "${krb_libdir}" && LDFLAGS="$LDFLAGS -L${krb_libdir}"
	7	- AC_CHECK_LIB(des,printf,[LIBS="${LIBS} -ldes"])
	8	+ AC_CHECK_LIB(des,printf,[LIBS="${LIBS} -lcrypt"])
	9	LDFLAGS=$hold_ldflags
	10	if test -n "$krb_incdir"; then
	11	includeopt="${includeopt} -I$krb_incdir"
	12	@@ -212,7 +212,7 @@
	13	includeopt="${includeopt} -I$GSSAPI/include"
	14	# FIXME: This is ugly, but these things don't seem to be standardized.
	15	if test "$ac_cv_header_gssapi_h" = "yes"; then
	16	- LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken"
	17	+ LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err"
	18	else
	19	LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
	20	fi

Line 0 Link Here

(-)/home/trasz/gcvs/files/patch-cvsunix-lib-hostname.c (+15 lines)
	1	--- cvsunix/lib/hostname.c.orig Wed Nov 22 15:14:13 2006
	2	+++ cvsunix/lib/hostname.c Wed Nov 22 15:15:36 2006
	3	@@ -28,6 +28,7 @@
	4
	5	/* Put this host's name into NAME, using at most NAMELEN characters */
	6
	7	+#if 0
	8	int
	9	gethostname(name, namelen)
	10	char *name;
	11	@@ -43,3 +44,4 @@
	12
	13	return (0);
	14	}
	15	+#endif

Lines 1-21 Link Here

(-)/home/trasz/gcvs/files/patch-make_configure (-14 / +12 lines)
1	--- make_configure.orig Thu Nov 7 19:42:00 2002	1	--- make_configure.orig Thu Nov 7 19:42:00 2002
2	+++ make_configure Fri Dec 20 19:23:07 2002	2	+++ make_configure Wed Nov 22 15:07:42 2006
3	@@ -1,14 +1,14 @@	3	@@ -1,14 +1,4 @@
4	-aclocal	4	-aclocal
5	-autoheader	5	-autoheader
6	+aclocal14	6	-
7	+autoheader213	7	-list=`find . -name Makefile.am -exec dirname {} \;`
8		8	-
9	list=`find . -name Makefile.am -exec dirname {} \;`	9	-for subdir in $list
10		10	-do
11	for subdir in $list	11	- echo making $subdir/Makefile.in
12	do
13	echo making $subdir/Makefile.in
14	- automake --add-missing --gnu $subdir/Makefile	12	- automake --add-missing --gnu $subdir/Makefile
15	+ automake14 --add-missing --gnu $subdir/Makefile	13	-done
16	done	14	-
17
18	-autoconf	15	-autoconf
19	+autoconf213	16	+cd cvsunix && autoreconf259
		17	+cd ..
20		18
21	./configure $*	19	./configure $*