diff options
Diffstat (limited to 'package/lsof')
| -rw-r--r-- | package/lsof/Makefile | 9 | ||||
| -rw-r--r-- | package/lsof/patches/patch-Configure | 30 | ||||
| -rw-r--r-- | package/lsof/patches/patch-lsof_4_84_src_Configure | 17 | ||||
| -rw-r--r-- | package/lsof/patches/patch-lsof_4_84_src_dialects_linux_dlsof_h (renamed from package/lsof/patches/patch-dialects_linux_dlsof_h) | 4 | ||||
| -rw-r--r-- | package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h (renamed from package/lsof/patches/patch-dialects_linux_machine_h) | 4 | ||||
| -rw-r--r-- | package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel | 11 |
6 files changed, 36 insertions, 39 deletions
diff --git a/package/lsof/Makefile b/package/lsof/Makefile index 8f0706031..8bad858ae 100644 --- a/package/lsof/Makefile +++ b/package/lsof/Makefile @@ -5,17 +5,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= lsof PKG_VERSION:= 4.84 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 6dae655988c810a7042c06a4e2fa3c5f PKG_DESCR:= list open files PKG_SECTION:= misc PKG_URL:= http://people.freebsd.org/~abe/ PKG_SITES:= ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ -PKG_HOST_DEPENDS:= !darwin - DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION}/${PKG_NAME}_${PKG_VERSION}_src +WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION} +WRKSRC= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION}/${PKG_NAME}_${PKG_VERSION}_src include $(TOPDIR)/mk/package.mk @@ -24,7 +23,7 @@ $(eval $(call PKG_template,LSOF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_ CONFIG_STYLE:= minimal CONFIGURE_PROG:= Configure CONFIGURE_ARGS:= -n linux -XAKE_FLAGS+= CC='${TARGET_CC}' +XAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' CFGL='${TARGET_LDFLAGS} -L./lib -llsof' INSTALL_STYLE:= manual post-extract: diff --git a/package/lsof/patches/patch-Configure b/package/lsof/patches/patch-Configure deleted file mode 100644 index e99001293..000000000 --- a/package/lsof/patches/patch-Configure +++ /dev/null @@ -1,30 +0,0 @@ ---- lsof_4.84_src.orig/Configure 2010-07-29 17:59:32.000000000 +0200 -+++ lsof_4.84_src/Configure 2010-10-07 20:03:14.000000000 +0200 -@@ -2739,27 +2739,6 @@ return(0); } - then - LSOF_CFGF="$LSOF_CFGF -DHASIPv6" - fi # } -- -- # Test for SELinux support. -- -- LSOF_TMP1=0 -- if test "X$LINUX_HASSELINUX" = "X" # { -- then -- if test -r ${LSOF_INCLUDE}/selinux/selinux.h # { -- then -- LSOF_TMP1=1 -- fi # } -- else -- if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "Xy" # { -- then -- LSOF_TMP1=1 -- fi # } -- fi # } -- if test $LSOF_TMP1 -eq 1 # { -- then -- LSOF_CFGF="$LSOF_CFGF -DHASSELINUX" -- LSOF_CFGL="$LSOF_CFGL -lselinux" -- fi # } - LSOF_DIALECT_DIR="linux" - LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" - ;; diff --git a/package/lsof/patches/patch-lsof_4_84_src_Configure b/package/lsof/patches/patch-lsof_4_84_src_Configure new file mode 100644 index 000000000..b1ca02fef --- /dev/null +++ b/package/lsof/patches/patch-lsof_4_84_src_Configure @@ -0,0 +1,17 @@ +--- lsof_4.84.orig/lsof_4.84_src/Configure 2010-07-29 17:59:32.000000000 +0200 ++++ lsof_4.84/lsof_4.84_src/Configure 2011-01-15 23:57:34.000000000 +0100 +@@ -5357,12 +5357,12 @@ then + if test "X$LSOF_RANLIB" != "X" # { + then + echo "" >> ${LSOF_LIB}/$LSOF_LIBMKF +- echo "RANLIB= $LSOF_RANLIB \${LIB}" >> ${LSOF_LIB}/$LSOF_LIBMKF ++ echo "RANLIB?= $LSOF_RANLIB" >> ${LSOF_LIB}/$LSOF_LIBMKF + fi # } + echo "" >> ${LSOF_LIB}/$LSOF_LIBMKF + if test "X$LSOF_CFLAGS_OVERRIDE" = "X" # { + then +- echo "CFLAGS= \${CDEFS} \${INCL} \${DEBUG}" >> ${LSOF_LIB}/$LSOF_LIBMKF ++ echo "CFLAGS?= \${CDEFS} \${INCL} \${DEBUG}" >> ${LSOF_LIB}/$LSOF_LIBMKF + else + echo "override CFLAGS=\${CDEFS} \${INCL} \${DEBUG}" >> ${LSOF_LIB}/$LSOF_LIBMKF + fi # } diff --git a/package/lsof/patches/patch-dialects_linux_dlsof_h b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_dlsof_h index 1b6314849..b15a001b1 100644 --- a/package/lsof/patches/patch-dialects_linux_dlsof_h +++ b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_dlsof_h @@ -1,5 +1,5 @@ ---- lsof_4.84_src.orig/dialects/linux/dlsof.h 2010-01-18 20:03:19.000000000 +0100 -+++ lsof_4.84_src/dialects/linux/dlsof.h 2010-10-07 20:35:57.000000000 +0200 +--- lsof_4.84.orig/lsof_4.84_src/dialects/linux/dlsof.h 2010-01-18 20:03:19.000000000 +0100 ++++ lsof_4.84/lsof_4.84_src/dialects/linux/dlsof.h 2011-01-16 00:01:43.000000000 +0100 @@ -49,13 +49,7 @@ #include <setjmp.h> #include <unistd.h> diff --git a/package/lsof/patches/patch-dialects_linux_machine_h b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h index 011144644..6066b38d8 100644 --- a/package/lsof/patches/patch-dialects_linux_machine_h +++ b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h @@ -1,5 +1,5 @@ ---- lsof_4.84_src.orig/dialects/linux/machine.h 2010-07-29 18:02:52.000000000 +0200 -+++ lsof_4.84_src/dialects/linux/machine.h 2010-10-07 20:03:14.000000000 +0200 +--- lsof_4.84.orig/lsof_4.84_src/dialects/linux/machine.h 2010-07-29 18:02:52.000000000 +0200 ++++ lsof_4.84/lsof_4.84_src/dialects/linux/machine.h 2011-01-16 00:01:48.000000000 +0100 @@ -632,6 +632,6 @@ * zeromem is a macro that uses bzero or memset. */ diff --git a/package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel b/package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel new file mode 100644 index 000000000..8cada0635 --- /dev/null +++ b/package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel @@ -0,0 +1,11 @@ +--- lsof_4.84.orig/lsof_4.84_src/lib/Makefile.skel 2001-02-13 03:12:22.000000000 +0100 ++++ lsof_4.84/lsof_4.84_src/lib/Makefile.skel 2011-01-15 23:58:50.000000000 +0100 +@@ -22,7 +22,7 @@ all: ${LIB} + + ${LIB}: ${OBJ} + ${AR} +- ${RANLIB} ++ ${RANLIB} ${LIB} + + clean: FRC + rm -f ${LIB} ${OBJ} errs Makefile.bak a.out core |