aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaddy <naddy@FreeBSD.org>2008-04-26 23:27:30 +0800
committernaddy <naddy@FreeBSD.org>2008-04-26 23:27:30 +0800
commitda920764127bb75cbab516bd92d177302bf5dbdc (patch)
tree7397fcb6d5bb4171eaf5ef0a365aac650ccf6d8f
parente485006361809fff5a0d998594ff0c9ada1a6304 (diff)
downloadfreebsd-ports-gnome-da920764127bb75cbab516bd92d177302bf5dbdc.tar.gz
freebsd-ports-gnome-da920764127bb75cbab516bd92d177302bf5dbdc.tar.zst
freebsd-ports-gnome-da920764127bb75cbab516bd92d177302bf5dbdc.zip
* Remove prototype for a nonexistent function that clashes with fexecve(2)
on 8.0-CURRENT. (pointyhat) * Minor clean up.
-rw-r--r--sysutils/sdd/Makefile7
-rw-r--r--sysutils/sdd/files/patch-include_schily.h11
-rw-r--r--sysutils/sdd/pkg-plist2
3 files changed, 15 insertions, 5 deletions
diff --git a/sysutils/sdd/Makefile b/sysutils/sdd/Makefile
index 0b3c7924d1bd..561f4c6bd2a7 100644
--- a/sysutils/sdd/Makefile
+++ b/sysutils/sdd/Makefile
@@ -15,17 +15,18 @@ COMMENT= Faster and improved version of dd
USE_GMAKE= yes
MAKE_ENV= MAKEPROG="${GMAKE}" CCOM="${CC}" COPTX="${CFLAGS}"
MAN1= sdd.1
+PLIST_FILES= bin/sdd
.include <bsd.port.pre.mk>
-.if ${MACHINE_ARCH} != "i386" || ${CC} != "cc"
+.if ${ARCH} != "i386" || ${CC} != "cc"
post-extract:
@${LN} -sf i386-freebsd-cc.rul \
- ${WRKSRC}/RULES/${MACHINE_ARCH}-freebsd-${CC}.rul
+ ${WRKSRC}/RULES/${ARCH}-freebsd-${CC}.rul
.endif
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/sdd/OBJ/${MACHINE_ARCH}-freebsd-${CC}/sdd \
+ ${INSTALL_PROGRAM} ${WRKSRC}/sdd/OBJ/${ARCH}-freebsd-${CC}/sdd \
${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/sdd/sdd.1 ${PREFIX}/man/man1
diff --git a/sysutils/sdd/files/patch-include_schily.h b/sysutils/sdd/files/patch-include_schily.h
new file mode 100644
index 000000000000..a8e023d9659c
--- /dev/null
+++ b/sysutils/sdd/files/patch-include_schily.h
@@ -0,0 +1,11 @@
+--- include/schily.h.orig 2008-04-26 16:53:01.000000000 +0200
++++ include/schily.h 2008-04-26 16:53:13.000000000 +0200
+@@ -108,8 +108,6 @@ extern int fexecle __PR((const char *, F
+ /* 6th arg not const, fexecv forces av[ac] = NULL */
+ extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
+ char **));
+-extern int fexecve __PR((const char *, FILE *, FILE *, FILE *,
+- char * const *, char * const *));
+ extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
+ extern int fspawnl __PR((FILE *, FILE *, FILE *,
+ const char *, const char *, ...));
diff --git a/sysutils/sdd/pkg-plist b/sysutils/sdd/pkg-plist
deleted file mode 100644
index c381ddd16429..000000000000
--- a/sysutils/sdd/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-bin/sdd