diff --git a/devel/Makefile b/devel/Makefile index 0bea75884140..b7d240321514 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -301,6 +301,7 @@ SUBDIR += dwarfdump SUBDIR += dyncall SUBDIR += e00compr + SUBDIR += e2fsprogs-libss SUBDIR += e4graph SUBDIR += e_dbus SUBDIR += easygit diff --git a/devel/e2fsprogs-libss/Makefile b/devel/e2fsprogs-libss/Makefile new file mode 100644 index 000000000000..47cfde00bcee --- /dev/null +++ b/devel/e2fsprogs-libss/Makefile @@ -0,0 +1,43 @@ +# New ports collection makefile for: e2fsprogs-libss +# Date created: 23 November 2009 +# Whom: Ben Kaduk +# +# $FreeBSD$ +# + +PORTREVISION= 0 +CATEGORIES= devel +PKGNAMESUFFIX= -libss + +MAINTAINER= kaduk-fbsd@mit.edu +COMMENT= Command-line interface parsing library from e2fsprogs + +CONFLICTS= heimdal-[0-9]* +CONFLICTS+= krb4-[0-9]* + +WITHOUT_NLS= yes +OPTIONS= # +CONFIGURE_ARGS= --enable-elf-shlibs +MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs +GNU_CONFIGURE= yes +USE_GMAKE= yes +USE_LDCONFIG= yes +ALL_TARGET= subs +INSTALL_WRKSRC= ${WRKSRC}/lib/ss +FILESDIR= ${.CURDIR}/files + +EXTRA_PATCHES= ${FILESDIR}/patch-lib-ss-Makefile.in + +MAN1= mk_cmds.1 + +PKGDIR= ${.CURDIR} + +pre-build: + @(cd ${WRKSRC}/lib/ss && compile_et ss_err.et && \ + ${REINPLACE_CMD} -f ${FILESDIR}/fix-ss_err.h.sed ss_err.h) + +post-build: + @(cd ${WRKSRC}/lib/ss && ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} \ + ${_MAKE_JOBS} ${MAKE_ARGS} all) + +.include "${MASTERDIR}/Makefile" diff --git a/devel/e2fsprogs-libss/files/fix-ss_err.h.sed b/devel/e2fsprogs-libss/files/fix-ss_err.h.sed new file mode 100644 index 000000000000..73dc2aff639b --- /dev/null +++ b/devel/e2fsprogs-libss/files/fix-ss_err.h.sed @@ -0,0 +1,2 @@ +/#define __ss_err_h__/a\ +#include diff --git a/devel/e2fsprogs-libss/files/patch-lib-ss-Makefile.in b/devel/e2fsprogs-libss/files/patch-lib-ss-Makefile.in new file mode 100644 index 000000000000..6b0811c0796f --- /dev/null +++ b/devel/e2fsprogs-libss/files/patch-lib-ss-Makefile.in @@ -0,0 +1,20 @@ +--- work/lib/ss/Makefile.in.orig 2009-11-28 23:03:52.000000000 +0000 ++++ work/lib/ss/Makefile.in 2009-11-28 23:04:20.000000000 +0000 +@@ -20,7 +20,7 @@ + ELF_IMAGE = libss + ELF_MYDIR = ss + ELF_INSTALL_DIR = $(root_libdir) +-ELF_OTHER_LIBS = -L../.. -lcom_err $(DLOPEN_LIB) ++ELF_OTHER_LIBS = -lcom_err $(DLOPEN_LIB) + + BSDLIB_VERSION = 1.0 + BSDLIB_IMAGE = libss +@@ -28,7 +28,7 @@ + BSDLIB_INSTALL_DIR = $(root_libdir) + + TAGS=etags +-COMPILE_ET=../et/compile_et --build-tree ++COMPILE_ET=compile_et + MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds + + # -I.. is so that ss/ss_err.h works diff --git a/devel/e2fsprogs-libss/pkg-descr b/devel/e2fsprogs-libss/pkg-descr new file mode 100644 index 000000000000..821bd5485b31 --- /dev/null +++ b/devel/e2fsprogs-libss/pkg-descr @@ -0,0 +1,5 @@ +This package includes a tool that parses a command table to generate a +simple command-line interface parser, the include files needed to compile +and use it, and the libraries needed to run programs that use it. + +It was originally inspired by the Multics SubSystem library. diff --git a/devel/e2fsprogs-libss/pkg-plist b/devel/e2fsprogs-libss/pkg-plist new file mode 100644 index 000000000000..b6eb9a7a038d --- /dev/null +++ b/devel/e2fsprogs-libss/pkg-plist @@ -0,0 +1,12 @@ +bin/mk_cmds +include/ss/ss.h +include/ss/ss_err.h +lib/libss.so.2.0 +lib/libss.so +lib/libss.a +lib/libss.so.2 +libdata/pkgconfig/ss.pc +share/ss/ct_c.awk +share/ss/ct_c.sed +@dirrm include/ss +@dirrm share/ss diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 19e88e957761..b4bc53af1a26 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV+= CPPFLAGS='${CPPFLAGS} -I${WRKSRC}/lib \ -I${LOCALBASE}/include -D_EXT2_USE_C_VERSIONS_' MAKE_ARGS+= LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib' -OPTIONS= NLS "Enable national language support" on +OPTIONS?= NLS "Enable national language support" on .if !defined(MASTERDIR) MAN1= chattr.1 lsattr.1