Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions

View File

@@ -0,0 +1,17 @@
$NetBSD: patch-aa,v 1.2 2010/06/28 10:18:58 joerg Exp $
--- Makefile.orig 2005-11-05 18:12:37.000000000 +0100
+++ Makefile
@@ -24,9 +24,9 @@ MAN_PAGES = $(NAME).1
RAW_FLAGS += -DVERSION=\"$(VERSION)\"
# Where we get installed
-BIN = /usr/local/bin
-MAN = /usr/local/man/man1
-CONF= /usr/local/etc
+BIN = ${DESTDIR}$(PREFIX)/bin
+MAN = ${DESTDIR}$(PREFIX)/$(PKGMANDIR)/man1
+CONF= $(PKG_SYSCONFDIR)
# Setup for compiling and cross-compiling for Windows
# The CR_ prefix refers to cross compiling from OSX to Windows
CR_CC = $(CR_BASE)/gcc

View File

@@ -0,0 +1,52 @@
$NetBSD: patch-ab,v 1.2 2010/06/28 10:18:58 joerg Exp $
--- Makefile.orig 2007-01-26 15:10:20.000000000 +0100
+++ Makefile
@@ -10,7 +10,7 @@ SYS := $(shell uname -s | tr -d "[0-9]"
# You can cross compile this program for Win32 using Linux and the
# MinGW compiler. See the README for details. If you have already
# installed MinGW, put the location ($PREFIX) here:
-CR_BASE = /usr/local/cross-tools/i386-mingw32msvc/bin
+CR_BASE = $(PREFIX)/cross-tools/i386-mingw32msvc/bin
# You shouldn't need to change anything below this line
#---------------------------------------------------------------------
@@ -27,6 +27,11 @@ RAW_FLAGS += -DVERSION=\"$(VERSION)\"
BIN = ${DESTDIR}$(PREFIX)/bin
MAN = ${DESTDIR}$(PREFIX)/$(PKGMANDIR)/man1
CONF= $(PKG_SYSCONFDIR)
+SAMPLES = ${DESTDIR}$(PREFIX)/share/examples/foremost
+
+# Tell it to config.c
+RAW_FLAGS += -DCONFDIR=\"$(CONF)\"
+
# Setup for compiling and cross-compiling for Windows
# The CR_ prefix refers to cross compiling from OSX to Windows
CR_CC = $(CR_BASE)/gcc
@@ -120,10 +125,11 @@ foremost: $(OBJ)
install: goals
install -m 755 $(NAME) $(BIN)
install -m 444 $(MAN_PAGES) $(MAN)
- install -m 444 foremost.conf $(CONF)
-macinstall: BIN = /usr/local/bin/
-macinstall: MAN = /usr/share/man/man1/
-macinstall: CONF = /usr/local/etc/
+ install -m 444 foremost.conf $(SAMPLES)
+macinstall: BIN = ${DESTDIR}$(PREFIX)/bin/
+macinstall: MAN = ${DESTDIR}$(PREFIX)/$(PKGMANDIR)/man1/
+macinstall: CONF = $(PREFIX)/etc/
+macinstall: SAMPLES = ${DESTDIR}$(PREFIX)/share/examples/foremost
macinstall: mac install
@@ -131,8 +137,8 @@ uninstall:
rm -f -- $(BIN)/{$(RM_GOALS)}
rm -f -- $(MAN)/{$(RM_DOCS)}
-macuninstall: BIN = /usr/bin
-macuninstall: MAN = /usr/share/man/man1
+macuninstall: BIN =${DESTDIR} $(PREFIX)/bin
+macuninstall: MAN =${DESTDIR} $(PREFIX)/$(PKGMANDIR)/man1
macuninstall: uninstall
#---------------------------------------------------------------------

View File

@@ -0,0 +1,18 @@
$NetBSD: patch-ac,v 1.1.1.1 2007/01/26 16:36:29 minskim Exp $
--- config.c.orig 2006-08-26 09:02:14.000000000 +0200
+++ config.c
@@ -285,11 +285,8 @@ int load_config_file(f_state *s)
/*Can't find a conf in the current directory
* So lets try the /usr/local/etc*/
-#ifdef __WIN32
- set_config_file(s, "/Program Files/foremost/foremost.conf");
-#else
- set_config_file(s, "/usr/local/etc/foremost.conf");
-#endif
+
+ set_config_file(s,CONFDIR "/" DEFAULT_CONFIG_FILE);
if ((f = fopen(get_config_file(s), "r")) == NULL)
{
print_error(s, get_config_file(s), strerror(errno));