Here's an update to allow building and running git on vax.
Cloning using git:// and https://, add/commit/branching, pushing using ssh
all seemed to worked fine. I must admit that cloning a github repo from
a vax seemed a bit... weird. 8)
The only changes are about static linking handling; I introduced
a workaround for vax ar(1) not having 's' by calling ranlib.
nm shows no difference in the resulting libraries on i386 and macppc.
About REVISION, I don't know whether I should:
- bump REVISION
- bump REVISION-main and REVISION-svn, since -x11 afaik isn't concerned
- let it as is, since package signatures shouldn't change on arches
where git was already OK
I chose the safe path in the diff.
Patch follows, but before, those warnings right at the beginning of the
compilation process (they were already there):
[...]
===> Building for git-1.8.1.2
systrace: deny user: jca, prog:
/usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/cc1, pid: 24230(0)[29309],
policy: /usr/bin/env, filters: 241, syscall: native-fswrite(5), filename:
/dev/null.gcda
GIT_VERSION = 1.8.1.2
systrace: deny user: jca, prog:
/usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/cc1, pid: 29579(0)[10622],
policy: /usr/bin/env, filters: 241, syscall: native-fswrite(5), filename:
/dev/null.gcda
[...]
Weird...
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.90
diff -u -p -r1.90 Makefile
--- Makefile 30 Jan 2013 12:16:13 -0000 1.90
+++ Makefile 18 Feb 2013 17:30:51 -0000
@@ -9,6 +9,8 @@ DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
PKGNAME-x11 = git-x11-${V}
+REVISION = 0
+
CATEGORIES = devel
HOMEPAGE = http://git-scm.com/
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 patch-Makefile
--- patches/patch-Makefile 25 Jan 2013 08:14:59 -0000 1.35
+++ patches/patch-Makefile 18 Feb 2013 18:01:25 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.35 2013/01/25 08:14:59 dcoppa Exp $
---- Makefile.orig Mon Jan 14 20:22:04 2013
-+++ Makefile Wed Jan 23 14:53:15 2013
-@@ -1123,13 +1123,13 @@ ifeq ($(uname_S),FreeBSD)
+--- Makefile.orig Mon Jan 28 21:01:51 2013
++++ Makefile Mon Feb 18 19:01:20 2013
+@@ -1123,13 +1123,16 @@ ifeq ($(uname_S),FreeBSD)
HAVE_PATHS_H = YesPlease
endif
ifeq ($(uname_S),OpenBSD)
@@ -11,6 +11,9 @@ $OpenBSD: patch-Makefile,v 1.35 2013/01/
NEEDS_LIBICONV = YesPlease
- BASIC_CFLAGS += -I/usr/local/include
- BASIC_LDFLAGS += -L/usr/local/lib
++ NEEDS_LIBINTL_BEFORE_LIBICONV = YesPlease
++ NEEDS_SSL_WITH_CURL = YesPlease
++ NEEDS_CRYPTO_WITH_SSL = YesPlease
+ BASIC_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
+ BASIC_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
HAVE_PATHS_H = YesPlease
@@ -18,16 +21,24 @@ $OpenBSD: patch-Makefile,v 1.35 2013/01/
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
-@@ -1600,7 +1600,7 @@ endif
- EXTLIBS += -lz
+@@ -2486,13 +2489,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
+ $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
- ifndef NO_OPENSSL
-- OPENSSL_LIBSSL = -lssl
-+ OPENSSL_LIBSSL = -lssl -lcrypto
- ifdef OPENSSLDIR
- BASIC_CFLAGS += -I$(OPENSSLDIR)/include
- OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib)
$(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
-@@ -2678,7 +2678,7 @@ export TEST_NO_MALLOC_CHECK
+ $(LIB_FILE): $(LIB_OBJS)
+- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
++ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $(LIB_OBJS) && ranlib $@
+
+ $(XDIFF_LIB): $(XDIFF_OBJS)
+- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
++ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $(XDIFF_OBJS) && ranlib $@
+
+ $(VCSSVN_LIB): $(VCSSVN_OBJS)
+- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(VCSSVN_OBJS)
++ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $(VCSSVN_OBJS) && ranlib $@
+
+ export DEFAULT_EDITOR DEFAULT_PAGER
+
+@@ -2678,7 +2681,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules
