- Fix build on -current New file: files/patch-help.c files/patch-ipc.c files/patch-putget.c
State Changed From-To: open->feedback Why do you define DOCS and EXAMPLES in OPTION and don't use it with PORT_OPTIONS:MDOCS and MEXAMPLES ?
jadawin@FreeBSD.org wrote: > Why do you define DOCS and EXAMPLES in OPTION and don't use it with > PORT_OPTIONS:MDOCS and MEXAMPLES ? Because documentation about converting ports to support STAGEDIR advises us to do so. https://wiki.freebsd.org/ports/StageDir
On Thu, 28 Nov 2013, KATO Tsuguru wrote: > jadawin@FreeBSD.org wrote: >=20 > > Why do you define DOCS and EXAMPLES in OPTION and don't use it with > > PORT_OPTIONS:MDOCS and MEXAMPLES ? >=20 > Because documentation about converting ports to support STAGEDIR > advises us to do so. >=20 > https://wiki.freebsd.org/ports/StageDir If you let a choice with an option, you must have a difference in Makefile. An option with no choice in installation is not an option. Basically, a portlint -a raise an error in this case. --=20 Philippe Aud=E9oud
jadawin@FreeBSD.org wrote: > If you let a choice with an option, you must have a difference in > Makefile. An option with no choice in installation is not an option. Porters-handbook also suggests that additional hacks in Makefile has been deprecated. When STAGEDIR is supported, PORT_OPTIONS value would be reffered during actuall installation from STAGEDIR to PREFIX. http://svnweb.freebsd.org/doc/head/en_US.ISO8859-1/books/porters-handbook/book.xml?r1=43053&r2=43054 > Basically, a portlint -a raise an error in this case. That warning appears to be wrong unless NO_STAGE=yes is set. It's likely that portlint hasn't been updated to catch up the latest specification yet.
Responsible Changed From-To: freebsd-ports-bugs->miwi I'll take it.
Remake of the patch against current tree.
State Changed From-To: feedback->closed Committed. Thanks!
State Changed From-To: closed->open reopen the patch is outdated witht he current portstree.
State Changed From-To: open->closed Committed. Thanks!
Author: miwi Date: Thu Feb 27 09:00:19 2014 New Revision: 346273 URL: http://svnweb.freebsd.org/changeset/ports/346273 QAT: https://qat.redports.org/buildarchive/r346273/ Log: - Fix build - Stage support PR: 184235 Submitted by: ports fury Added: head/net/pmf/files/patch-help.c (contents, props changed) head/net/pmf/files/patch-ipc.c (contents, props changed) head/net/pmf/files/patch-putget.c (contents, props changed) Modified: head/net/pmf/Makefile head/net/pmf/files/patch-Makefile Modified: head/net/pmf/Makefile ============================================================================== --- head/net/pmf/Makefile Thu Feb 27 08:58:54 2014 (r346272) +++ head/net/pmf/Makefile Thu Feb 27 09:00:19 2014 (r346273) @@ -12,35 +12,29 @@ COMMENT= Padrone's Mud Frontend WRKSRC= ${WRKDIR}/pmfdir/src -SYSSRC= ${WRKSRC}/../system_dir -DOCSRC= ${WRKSRC}/../doc -XMPSRC= ${WRKSRC}/../examples -SUB_FILES= pmfrc.default - -CFLAGS+= -Wno-return-type +USES= readline -NO_STAGE= yes +SUB_FILES= pmfrc.default OPTIONS_DEFINE= DOCS EXAMPLES -.include <bsd.port.options.mk> +post-build: + @${LN} -sf .pmfrc ${WRKSRC}/../examples/dot.pmfrc do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/pmf ${PREFIX}/bin - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${SYSSRC}/NEWS ${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/pmfrc.default ${DATADIR} - @${MKDIR} ${DATADIR}/helpfiles - ${INSTALL_DATA} ${SYSSRC}/helpfiles/.pmfrc ${DATADIR}/helpfiles - ${INSTALL_DATA} ${SYSSRC}/helpfiles/* ${DATADIR}/helpfiles -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${XMPSRC}/.pmfrc ${EXAMPLESDIR}/dot.pmfrc - ${INSTALL_DATA} ${XMPSRC}/* ${EXAMPLESDIR} -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOCSRC}/* ${DOCSDIR} -.endif + (cd ${WRKSRC} && ${INSTALL_PROGRAM} pmf ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC}/../system_dir && ${INSTALL_DATA} NEWS \ + ${STAGEDIR}${DATADIR}) + (cd ${WRKDIR} && ${INSTALL_DATA} pmfrc.default \ + ${STAGEDIR}${DATADIR}) + @(cd ${WRKSRC}/../system_dir && ${COPYTREE_SHARE} helpfiles \ + ${STAGEDIR}${DATADIR}) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/../doc && ${INSTALL_DATA} * \ + ${STAGEDIR}${DOCSDIR}) + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/../examples && ${INSTALL_DATA} * \ + ${STAGEDIR}${EXAMPLESDIR}) .include <bsd.port.mk> Modified: head/net/pmf/files/patch-Makefile ============================================================================== --- head/net/pmf/files/patch-Makefile Thu Feb 27 08:58:54 2014 (r346272) +++ head/net/pmf/files/patch-Makefile Thu Feb 27 09:00:19 2014 (r346273) @@ -34,26 +34,26 @@ ###################################################################### -@@ -104,7 +105,8 @@ - READLINE_LIB = $(READLINE_DIR)/libreadline.a +@@ -101,7 +102,7 @@ + + READLINE_DIR = readline + C_PACKAGES_DIR = c_packages +-READLINE_LIB = $(READLINE_DIR)/libreadline.a ++#READLINE_LIB = $(READLINE_DIR)/libreadline.a C_PACKAGES_LIB = $(C_PACKAGES_DIR)/libc_packs.a --LIBS = $(READLINE_LIB) $(C_PACKAGES_LIB) -+#LIBS = $(READLINE_LIB) $(C_PACKAGES_LIB) -+LIBS = $(C_PACKAGES_LIB) -lreadline -lcompat - - INCLUDEDIRS = -I$(C_PACKAGES_DIR)/safe_malloc \ - -I$(C_PACKAGES_DIR)/generic_list \ -@@ -123,7 +125,7 @@ + LIBS = $(READLINE_LIB) $(C_PACKAGES_LIB) +@@ -123,8 +124,7 @@ pmf: $(OBJECTS) $(LIBS) rm -f compile_time.c - $(CC) -o pmf $(CFLAGS) $(OBJECTS) $(LIBS) -ltermcap -lresolv -+ $(CC) -o pmf $(CFLAGS) $(OBJECTS) $(LIBS) -ltermcap - strip pmf +- strip pmf ++ $(CC) -o pmf $(CFLAGS) $(OBJECTS) $(LIBS) -ltermcap -lreadline -lcompat rm -f compile_time.o -@@ -133,10 +135,10 @@ + compile_time.c: +@@ -133,10 +133,10 @@ ###################################################################### $(READLINE_LIB): Added: head/net/pmf/files/patch-help.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pmf/files/patch-help.c Thu Feb 27 09:00:19 2014 (r346273) @@ -0,0 +1,30 @@ +--- help.c.orig ++++ help.c +@@ -16,10 +16,11 @@ + #include "globals.h" + + extern char compile_time[], version[]; ++extern void cmd_help(); + + /*---------------------------------------------------------------------------*/ + +-cmd_help(orig_arg) ++void cmd_help(orig_arg) + char *orig_arg; + { + char *arg, *lc = NULL, *try2 = NULL, *try3 = NULL, *try4 = NULL; +--- help.c.orig ++++ help.c +@@ -16,10 +16,11 @@ + #include "globals.h" + + extern char compile_time[], version[]; ++extern void cmd_help(); + + /*---------------------------------------------------------------------------*/ + +-cmd_help(orig_arg) ++void cmd_help(orig_arg) + char *orig_arg; + { + char *arg, *lc = NULL, *try2 = NULL, *try3 = NULL, *try4 = NULL; Added: head/net/pmf/files/patch-ipc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pmf/files/patch-ipc.c Thu Feb 27 09:00:19 2014 (r346273) @@ -0,0 +1,42 @@ +--- ipc.c.orig ++++ ipc.c +@@ -35,8 +35,7 @@ + #endif /* FD_ZERO */ + + extern char *get_now_date_string(); +- +-extern int errno; ++extern void telnet_protocol(); + + static struct in_addr host_address; + static struct sockaddr_in socket_address; +@@ -360,7 +359,7 @@ + /* This function takes the three bytes from a telnet command, + * and implements a very limited telnet protocol. + */ +-telnet_protocol(one, two, three) ++void telnet_protocol(one, two, three) + unsigned int one, two, three; + { + unsigned char reply[3]; +--- ipc.c.orig ++++ ipc.c +@@ -35,8 +35,7 @@ + #endif /* FD_ZERO */ + + extern char *get_now_date_string(); +- +-extern int errno; ++extern void telnet_protocol(); + + static struct in_addr host_address; + static struct sockaddr_in socket_address; +@@ -360,7 +359,7 @@ + /* This function takes the three bytes from a telnet command, + * and implements a very limited telnet protocol. + */ +-telnet_protocol(one, two, three) ++void telnet_protocol(one, two, three) + unsigned int one, two, three; + { + unsigned char reply[3]; Added: head/net/pmf/files/patch-putget.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pmf/files/patch-putget.c Thu Feb 27 09:00:19 2014 (r346273) @@ -0,0 +1,56 @@ +--- putget.c.orig ++++ putget.c +@@ -30,6 +30,7 @@ + *expand_variables(), + *find_robot_action_string(), + *return_last(); ++extern void cmd_putfile(), cmd_getfile(); + + /* This is a temporary buffer of text received from the MUD game. + * If the flag "getfiling" is true, the routines that receive the MUD +@@ -44,7 +45,7 @@ + /*---------------------------------------------------------------------------*/ + + /* Send a file to LPmud using the built-in editor */ +-cmd_putfile(filename, optional_filename) ++void cmd_putfile(filename, optional_filename) + char *filename, *optional_filename; + { + char *local_filename, *remote_filename, cmd_buffer[MAX_LINE_LENGTH + 1]; +@@ -103,7 +104,7 @@ + /*---------------------------------------------------------------------------*/ + + /* Get a file from LPmud using the built-in editor */ +-cmd_getfile(filename, optional_filename) ++void cmd_getfile(filename, optional_filename) + char *filename, *optional_filename; + { + char *local_filename, *remote_filename, cmd_buffer[MAX_LINE_LENGTH + 1]; +--- putget.c.orig ++++ putget.c +@@ -30,6 +30,7 @@ + *expand_variables(), + *find_robot_action_string(), + *return_last(); ++extern void cmd_putfile(), cmd_getfile(); + + /* This is a temporary buffer of text received from the MUD game. + * If the flag "getfiling" is true, the routines that receive the MUD +@@ -44,7 +45,7 @@ + /*---------------------------------------------------------------------------*/ + + /* Send a file to LPmud using the built-in editor */ +-cmd_putfile(filename, optional_filename) ++void cmd_putfile(filename, optional_filename) + char *filename, *optional_filename; + { + char *local_filename, *remote_filename, cmd_buffer[MAX_LINE_LENGTH + 1]; +@@ -103,7 +104,7 @@ + /*---------------------------------------------------------------------------*/ + + /* Get a file from LPmud using the built-in editor */ +-cmd_getfile(filename, optional_filename) ++void cmd_getfile(filename, optional_filename) + char *filename, *optional_filename; + { + char *local_filename, *remote_filename, cmd_buffer[MAX_LINE_LENGTH + 1]; _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"