diff options
author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2002-03-31 15:52:04 +0000 |
---|---|---|
committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2002-03-31 15:52:04 +0000 |
commit | 32cf98bd6619c8c07dda53c8e5c06ee5355f2041 (patch) | |
tree | 79fe6365973aef76a6b11ae4446a79232a501b00 /www/w3m | |
parent | upgrade to 6.3 (diff) |
Fix build error on -current. (*)
Remove useless post-extract target and post-patch target.
Submitted by: Masahide -mac- NODA <mac@clave.gr.jp> (*)
Notes
Notes:
svn path=/head/; revision=57060
Diffstat (limited to 'www/w3m')
-rw-r--r-- | www/w3m/Makefile | 21 | ||||
-rw-r--r-- | www/w3m/files/extra-patch-configure-no-m17n | 11 | ||||
-rw-r--r-- | www/w3m/files/extra-patch-etc.c-no-m17n | 11 | ||||
-rw-r--r-- | www/w3m/files/extra-patch-image.c-img | 11 | ||||
-rw-r--r-- | www/w3m/files/extra-patch-search.c-japanese | 11 | ||||
-rw-r--r-- | www/w3m/files/patch-configure | 4 |
6 files changed, 55 insertions, 14 deletions
diff --git a/www/w3m/Makefile b/www/w3m/Makefile index feb1bf7e5f48..784a0c5db261 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -60,6 +60,8 @@ CONFIGURE_ARGS+= --suffix="" PLIST_SUB+= M17N_ONLY="" NO_M17N="@comment " .else +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-configure-no-m17n \ + ${PATCHDIR}/extra-patch-etc.c-no-m17n PLIST_SUB+= M17N_ONLY="@comment " NO_M17N="" .endif @@ -71,6 +73,7 @@ DOCS_JP= ${DOCS} README.SSL README.cookie \ README.keymap README.mailcap README.menu PLIST_SUB+= JAPANESE_ONLY="" +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-search.c-japanese .else PLIST_SUB+= JAPANESE_ONLY="@comment " .endif @@ -92,6 +95,8 @@ DOCS+= README.img DOCS_JP+= README.img PLIST_SUB+= INLINE_IMAGE_ONLY="" +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-image.c-img + PKGMESSAGE= ${MASTERDIR}/pkg-message .else PLIST_SUB+= INLINE_IMAGE_ONLY="@comment " @@ -100,6 +105,10 @@ PLIST_SUB+= INLINE_IMAGE_ONLY="@comment " PKGMESSAGE= ${NONEXISTENT} .endif +.if defined(M17N) +.undef EXTRA_PATCHES +.endif + pre-everything:: .if defined(M17N) @${ECHO_MSG} "====>" @@ -113,18 +122,6 @@ pre-extract: @${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL." .endif -post-extract: -.if defined(INLINE_IMAGE) && !defined(M17N) - ${SED} -e "s,w3m/0.2.5,w3m/0.2.4+cvs," < ${WRKSRC}/version.c.in > ${WRKSRC}/version.c.in.tmp - ${MV} ${WRKSRC}/version.c.in.tmp ${WRKSRC}/version.c.in -.endif - -post-patch: -.if defined(INLINE_IMAGE) && !defined(M17N) - ${SED} -e "s,w3m/0.2.4+cvs-img-2.2,w3m/0.2.5-img-2.2," < ${WRKSRC}/version.c.in > ${WRKSRC}/version.c.in.tmp - ${MV} ${WRKSRC}/version.c.in.tmp ${WRKSRC}/version.c.in -.endif - post-install: .if !defined(NOPORTDOCS) .if defined(JAPANESE) diff --git a/www/w3m/files/extra-patch-configure-no-m17n b/www/w3m/files/extra-patch-configure-no-m17n new file mode 100644 index 000000000000..0c2c51ea2580 --- /dev/null +++ b/www/w3m/files/extra-patch-configure-no-m17n @@ -0,0 +1,11 @@ +--- configure.orig Sun Mar 31 22:20:25 2002 ++++ configure Sun Mar 31 22:16:46 2002 +@@ -1821,7 +1821,7 @@ + then + echo "You have setpgrp( pid, pgrp )." + def_have_setpgrp='#define HAVE_SETPGRP' +- def_setpgrp='#define setpgrp() setpgrp( 0, 0 )' ++ def_setpgrp='#define SETPGRP() setpgrp( 0, 0 )' + else + def_have_setpgrp='' + fi diff --git a/www/w3m/files/extra-patch-etc.c-no-m17n b/www/w3m/files/extra-patch-etc.c-no-m17n new file mode 100644 index 000000000000..14bdaf2a99aa --- /dev/null +++ b/www/w3m/files/extra-patch-etc.c-no-m17n @@ -0,0 +1,11 @@ +--- etc.c.orig Sun Mar 31 19:42:53 2002 ++++ etc.c Sun Mar 31 19:43:48 2002 +@@ -1075,7 +1075,7 @@ + flush_tty(); + if ((pid = fork()) == 0) { + reset_signals(); +- setpgrp(); ++ SETPGRP(); + close_tty(); + fclose(stdout); + fclose(stderr); diff --git a/www/w3m/files/extra-patch-image.c-img b/www/w3m/files/extra-patch-image.c-img new file mode 100644 index 000000000000..7ac5f4b71310 --- /dev/null +++ b/www/w3m/files/extra-patch-image.c-img @@ -0,0 +1,11 @@ +--- image.c.orig Sun Mar 31 19:43:11 2002 ++++ image.c Sun Mar 31 19:43:37 2002 +@@ -106,7 +106,7 @@ + reset_signals(); + signal(SIGINT, SIG_IGN); + #ifdef HAVE_SETPGRP +- setpgrp(); ++ SETPGRP(); + #endif + close_tty(); + close(fdr[0]); diff --git a/www/w3m/files/extra-patch-search.c-japanese b/www/w3m/files/extra-patch-search.c-japanese new file mode 100644 index 000000000000..07f66c751cd1 --- /dev/null +++ b/www/w3m/files/extra-patch-search.c-japanese @@ -0,0 +1,11 @@ +--- search.c.orig Sun Mar 31 19:43:19 2002 ++++ search.c Sun Mar 31 19:43:56 2002 +@@ -52,7 +52,7 @@ + /* child */ + reset_signals(); + #ifdef HAVE_SETPGRP +- setpgrp(); ++ SETPGRP(); + #endif + close_tty(); + close(fdr[0]); diff --git a/www/w3m/files/patch-configure b/www/w3m/files/patch-configure index b33e10cd85cd..4ed12f1ddc24 100644 --- a/www/w3m/files/patch-configure +++ b/www/w3m/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Tue Feb 12 17:52:58 2002 -+++ configure Fri Mar 29 19:27:19 2002 +--- configure.orig Sun Mar 31 22:17:49 2002 ++++ configure Sun Mar 31 22:16:46 2002 @@ -53,19 +53,22 @@ shift ;; |