diff options
| -rw-r--r-- | sysutils/foremost/Makefile | 18 | ||||
| -rw-r--r-- | sysutils/foremost/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/foremost/files/patch-Makefile | 32 | ||||
| -rw-r--r-- | sysutils/foremost/files/patch-foremost.h | 18 |
4 files changed, 12 insertions, 60 deletions
diff --git a/sysutils/foremost/Makefile b/sysutils/foremost/Makefile index 62922849d0c6..84110cf7a7c9 100644 --- a/sysutils/foremost/Makefile +++ b/sysutils/foremost/Makefile @@ -6,26 +6,28 @@ # PORTNAME= foremost -PORTVERSION= 0.69 +PORTVERSION= 1.0 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= http://${PORTNAME}.sourceforge.net/pkg/ MAINTAINER= onatan@gmail.com COMMENT= Console program to recover files based on their headers and footers USE_GMAKE= yes -ALL_TARGET= openbsd +ALL_TARGET= freebsd MAN1= foremost.1 USE_REINPLACE= yes PLIST_FILES= bin/foremost etc/foremost.conf.sample post-patch: - @${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|' ${WRKSRC}/foremost.h + @${REINPLACE_CMD} -e 's|gcc|${CC}|; s|-Wall -O2|${CFLAGS}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/config.c + @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' ${WRKSRC}/${MAN1} -post-install: - @${STRIP_CMD} ${PREFIX}/bin/foremost - @${INSTALL} -Cm 644 ${WRKSRC}/foremost.conf ${PREFIX}/etc/foremost.conf.sample +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/foremost.conf ${PREFIX}/etc/foremost.conf.sample + ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1 .include <bsd.port.mk> diff --git a/sysutils/foremost/distinfo b/sysutils/foremost/distinfo index e9408fe4d7f2..dfa2edd4d136 100644 --- a/sysutils/foremost/distinfo +++ b/sysutils/foremost/distinfo @@ -1,2 +1,2 @@ -MD5 (foremost-0.69.tar.gz) = c52a0aa87180a5331f28acbb6563e9b2 -SIZE (foremost-0.69.tar.gz) = 27719 +MD5 (foremost-1.0.tar.gz) = ced1de9efeea98730e3988907ae2aa92 +SIZE (foremost-1.0.tar.gz) = 50008 diff --git a/sysutils/foremost/files/patch-Makefile b/sysutils/foremost/files/patch-Makefile deleted file mode 100644 index 0d51f3c66b89..000000000000 --- a/sysutils/foremost/files/patch-Makefile +++ /dev/null @@ -1,32 +0,0 @@ ---- Makefile.orig Fri Jan 9 13:45:23 2004 -+++ Makefile Wed Jun 16 21:36:33 2004 -@@ -1,5 +1,5 @@ - --CC = gcc -+CC?= gcc - CC_OPTS = -Wall -O2 - GOAL = foremost - -@@ -14,8 +14,9 @@ - #--------------------------------------------------------------------- - - # Where foremost gets installed --BIN = /usr/local/bin --MAN = /usr/local/man/man1 -+PREFIX ?= /usr/local -+BIN = $(PREFIX)/bin -+MAN = $(PREFIX)/man/man1 - - # This should be commented out when debugging is done - #CC_OPTS += -D__DEBUG -ggdb -@@ -55,8 +56,8 @@ - $(CC) -o $(GOAL) $(OBJS) - - install: all -- install -CDm 755 $(GOAL) $(BIN)/$(GOAL) -- install -CDm 644 $(GOAL).1 $(MAN)/$(GOAL).1 -+ install -Cm 755 $(GOAL) $(BIN)/$(GOAL) -+ install -Cm 644 $(GOAL).1 $(MAN)/$(GOAL).1 - - uninstall: - rm -f $(BIN)/$(GOAL) $(MAN)/$(GOAL).1 diff --git a/sysutils/foremost/files/patch-foremost.h b/sysutils/foremost/files/patch-foremost.h deleted file mode 100644 index b60ca7b74002..000000000000 --- a/sysutils/foremost/files/patch-foremost.h +++ /dev/null @@ -1,18 +0,0 @@ ---- foremost.h.orig Fri Jan 9 13:45:23 2004 -+++ foremost.h Wed Jun 16 22:51:42 2004 -@@ -40,6 +40,7 @@ - #define strtoull strtoul - #include <sys/ttycom.h> - #include <sys/param.h> -+#include <libgen.h> /* for basename() */ - #endif /* ifdef __OPENBSD */ - - #ifdef __LINUX -@@ -178,7 +179,7 @@ - #define FOREMOST_NOEXTENSION '\xFF' - - #define FOREMOST_DEFAULT_WILDCARD '?' --#define FOREMOST_DEFAULT_CONFIG_FILE "foremost.conf" -+#define FOREMOST_DEFAULT_CONFIG_FILE "PREFIX/etc/foremost.conf" - - #define FOREMOST_DEFAULT_OUTPUT_DIR "foremost-output" |