cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to fossil 1.22 from James Turner, minor tweak from me

Browse Source
This commit is contained in:
sthen 2012-04-04 22:49:48 +00:00
parent 422fb91b89
commit 57f96e1c05
4 changed files with 20 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
devel/fossil/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.31 2011/12/16 11:32:22 sthen Exp $
# $OpenBSD: Makefile,v 1.32 2012/04/04 22:49:48 sthen Exp $
COMMENT = simple distributed software configuration management
DISTNAME = fossil-src-20111213135356
PKGNAME = fossil-1.21
DISTNAME = fossil-src-20120317175325
PKGNAME = fossil-1.22
EPOCH = 0
CATEGORIES = devel www
@ -21,22 +21,24 @@ PERMIT_DISTFILES_FTP = Yes
FLAVORS= static
FLAVOR?=
.if ${FLAVOR} == "static"
MAKE_FLAGS = LDFLAGS="-static" TCC="${CC} -Wall -DUSE_PREAD"
.else
MAKE_FLAGS = TCC="${CC} -Wall -DFOSSIL_ENABLE_SSL -DUSE_PREAD"
.endif
WANTLIB = c crypto ssl z
WANTLIB = c crypto ssl sqlite3 z
MODULES = lang/tcl
LIB_DEPENDS = databases/sqlite3
BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS}
CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --disable-internal-sqlite --disable-lineedit
CONFIGURE_ENV = CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib"
.if ${FLAVOR} == "static"
CONFIGURE_ARGS += --static --with-openssl=none
.endif
REGRESS_DEPENDS = ${MODTCL_RUN_DEPENDS} \
databases/sqlite3
MAKE_FILE = Makefile.classic
MAKE_FLAGS += BCC="${CC}"
do-regress:
@cd ${WRKSRC} && ${MODTCL_BIN} test/tester.tcl fossil

10
devel/fossil/distinfo
View File

@ -1,5 +1,5 @@
MD5 (fossil-src-20111213135356.tar.gz) = uBwT3BRYBJEcC5QcgEUi1g==
RMD160 (fossil-src-20111213135356.tar.gz) = 7XXQ+V9gXi28r5BcARn+/Y5BQo0=
SHA1 (fossil-src-20111213135356.tar.gz) = kEKBVheJOdv7dKqn0B2iyqgNDyQ=
SHA256 (fossil-src-20111213135356.tar.gz) = yYVWzR+mq8LgKqON4a9CX6n/CSR+cvYxyf9sI5xG5x0=
SIZE (fossil-src-20111213135356.tar.gz) = 2765234
MD5 (fossil-src-20120317175325.tar.gz) = pxBkUHIuhHeXLSMPpTVwLw==
RMD160 (fossil-src-20120317175325.tar.gz) = zInAfxq4We4yzF+sqqHkWVS2k3Y=
SHA1 (fossil-src-20120317175325.tar.gz) = Aum+PPawct/SyY+n3QWi30oUz7Y=
SHA256 (fossil-src-20120317175325.tar.gz) = jqNGKinmRf4L0GLVdC3k4ZIaOKzO1RB9CEZYIdlaqbA=
SIZE (fossil-src-20120317175325.tar.gz) = 2759495

15
devel/fossil/patches/patch-src_http_socket_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_http_socket_c,v 1.1 2011/12/16 11:32:22 sthen Exp $
--- src/http_socket.c.orig Fri Dec 16 11:27:18 2011
+++ src/http_socket.c Fri Dec 16 11:27:30 2011
@@ -35,10 +35,10 @@
# include <ws2tcpip.h>
# endif
#else
+# include <netinet/in.h>
# include <arpa/inet.h>
# include <sys/socket.h>
# include <netdb.h>
-# include <netinet/in.h>
#endif
#include <assert.h>
#include <sys/types.h>

12
devel/fossil/patches/patch-src_main_mk
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_main_mk,v 1.12 2011/12/16 11:32:22 sthen Exp $
--- src/main.mk.orig Tue Dec 13 09:10:57 2011
+++ src/main.mk Tue Dec 13 05:21:33 2011
@@ -1015,7 +1015,7 @@ $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(S
$(OBJDIR)/zip.h: $(OBJDIR)/headers
$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
- $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
+ $(XTCC) -DHAVE_STDINT_H=1 -DHAVE_INTTYPES_H=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o