Import of pkgsrc-2014Q1

2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
--- a/textproc/lua-expat/patches/patch-Makefile
+++ b/textproc/lua-expat/patches/patch-Makefile
@@ -0,0 +1,19 @@
+$NetBSD: patch-Makefile,v 1.1 2013/09/01 04:48:21 ryoon Exp $
+
+* Remove -D option of install, BSD install does not support it.
+
+--- Makefile.orig	2013-05-29 22:02:24.000000000 +0000
+++ Makefile
+@@ -27,8 +27,8 @@ src/$(LIBNAME):
+ 	$(CC) $(CF) $(LF) -o $@ src/$(T)lib.c
+ 
+ install:
+-	$(INSTALL_PROGRAM) -D src/$(LIBNAME) $(DESTDIR)$(LUA_CDIR)/$(LIBNAME)
+-	$(INSTALL_PROGRAM) -D src/$T/lom.lua $(DESTDIR)$(LUA_LDIR)/$T/lom.lua
+	$(INSTALL_PROGRAM) src/$(LIBNAME) $(DESTDIR)$(LUA_CDIR)/$(LIBNAME)
+	$(INSTALL_PROGRAM) src/$T/lom.lua $(DESTDIR)$(LUA_LDIR)/$T/lom.lua
+ 
+ clean:
+-	$(RM) src/$(LIBNAME) $(OBJS)
+\ No newline at end of file
+	$(RM) src/$(LIBNAME) $(OBJS)
--- a/textproc/lua-expat/patches/patch-aa
+++ b/textproc/lua-expat/patches/patch-aa
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/12/15 12:43:04 fhajny Exp $
-
-Fix environment for true /bin/sh, LDFLAGS
-
--- makefile.orig	2006-06-08 20:41:48.000000000 +0000
-+++ makefile
-@@ -12,7 +12,9 @@ OBJS= src/lxplib.o $(COMPAT_O)
- lib: src/$(LIBNAME)
- 
- src/$(LIBNAME) : $(OBJS)
-	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat
-+	MACOSX_DEPLOYMENT_TARGET="10.3"
-+	export MACOSX_DEPLOYMENT_TARGET
-+	$(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) $(LDFLAGS) -lexpat -llua
- 
- $(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
- 	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
--- a/textproc/lua-expat/patches/patch-ac
+++ b/textproc/lua-expat/patches/patch-ac
@@ -1,41 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/12/15 12:43:04 fhajny Exp $
-
-Standard lua locations, compiler fixes
-
--- config.orig	2006-06-08 20:41:48.000000000 +0000
-+++ config
-@@ -1,12 +1,12 @@
- # Installation directories
- # System's libraries directory (where binary libraries are installed)
-LUA_LIBDIR= /usr/local/lib/lua/5.0
-+LUA_LIBDIR= $(PREFIX)
- # System's lua directory (where Lua libraries are installed)
-LUA_DIR= /usr/local/share/lua/5.0
-+LUA_DIR?= $(PREFIX)
- # Lua includes directory
-LUA_INC= /usr/local/include
-+LUA_INC?= $(PREFIX)/include
- # Expat includes directory
-EXPAT_INC= /usr/local/include
-+EXPAT_INC?= $(PREFIX)/include
- 
- # OS dependent
- LIB_OPTION= -shared #for Linux
-@@ -17,7 +17,7 @@ LIBNAME= $T.so.$V
- # (according to Lua 5.1 definition:
- # first version digit * 100 + second version digit
- # e.g. Lua 5.0.2 => 500, Lua 5.1 => 501, Lua 5.1.1 => 501)
-LUA_VERSION_NUM= 500
-+LUA_VERSION_NUM?= 501
- COMPAT_DIR= ../compat/src
- 
- # Compilation parameters
-@@ -31,6 +31,6 @@ CWARNS = -Wall -pedantic \
-         -Wshadow \
-         -Wwrite-strings
- 
-CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \
-+CFLAGS += -O2 -I$(LUA_INC) \
-    -I$(COMPAT_DIR) -I$(EXPAT_INC)
-CC = gcc
-+CC? = gcc