diff options
| author | Michael Scheidell <scheidell@FreeBSD.org> | 2012-04-20 09:02:32 +0000 |
|---|---|---|
| committer | Michael Scheidell <scheidell@FreeBSD.org> | 2012-04-20 09:02:32 +0000 |
| commit | 5ff1a0856238a4d0faadeccd25bbc51120c79b3f (patch) | |
| tree | 485f517dea0c761175ed94e0f25db33eb2a5737e /japanese | |
| parent | 9fb658ddc31ff03229bb84592335ff667fbffe5d (diff) | |
| download | ports-5ff1a0856238a4d0faadeccd25bbc51120c79b3f.tar.gz ports-5ff1a0856238a4d0faadeccd25bbc51120c79b3f.zip | |
Notes
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/emacs-emcws/Makefile | 12 | ||||
| -rw-r--r-- | japanese/emacs-emcws/files/patch-src:filelock.c | 28 |
2 files changed, 29 insertions, 11 deletions
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index fa4f58a5012b..5d49d5b99f3e 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -146,18 +146,8 @@ PLIST_SUB+= EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET} \ SCRIPTS_ENV= SED=${SED} MV=${MV} \ DOC_FILE=${DOC_FILE} -.if exists(${PREFIX}/bin/emacs-${EMACS_VER}) -EMACS_BASE=${PREFIX} -.else -EMACS_BASE=${LOCALBASE} -.endif - .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 900007 -BROKEN= does not build -.endif - .if ${ARCH} == "ia64" BROKEN= Segfault during build on ia64 CFLAGS:= ${CFLAGS:C/-O.?/-O0/g} @@ -175,7 +165,7 @@ pre-build: ${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \; ${RM} -rf ${WRKSRC}/info/* @(cd ${WRKSRC}/src/../lisp; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${EMACS_BASE}/bin/emacs-${EMACS_VER}) + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${EMACS_CMD}) @(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs) @(cd ${WRKSRC}/src/../lisp; \ ${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \ diff --git a/japanese/emacs-emcws/files/patch-src:filelock.c b/japanese/emacs-emcws/files/patch-src:filelock.c new file mode 100644 index 000000000000..71906d2c8038 --- /dev/null +++ b/japanese/emacs-emcws/files/patch-src:filelock.c @@ -0,0 +1,28 @@ +--- src/filelock.c.orig 2010-11-04 11:03:51.000000000 +0900 ++++ src/filelock.c 2010-11-04 11:15:59.000000000 +0900 +@@ -65,7 +65,13 @@ + + #ifdef CLASH_DETECTION + ++#if __FreeBSD_version >= 900007 ++#include <utmpx.h> ++#undef BOOT_TIME ++#define ut_time ut_tv.tv_sec ++#else + #include <utmp.h> ++#endif + + /* A file whose last-modified time is just after the most recent boot. + Define this to be NULL to disable checking for this file. */ +@@ -256,7 +262,11 @@ + char *filename; + int newest; + { ++#if __FreeBSD_version >= 900007 ++ struct utmpx ut, *utp; ++#else + struct utmp ut, *utp; ++#endif + int desc; + + if (filename)
\ No newline at end of file |