Date: Tue, 15 Mar 2016 02:36:04 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411133 - in head/sysutils/libretto-config: . files Message-ID: <201603150236.u2F2a4tZ032960@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Mar 15 02:36:04 2016 New Revision: 411133 URL: https://svnweb.freebsd.org/changeset/ports/411133 Log: - Switch to options helpers - Regenerate patches with `make makepatch` Modified: head/sysutils/libretto-config/Makefile head/sysutils/libretto-config/files/patch-Makefile head/sysutils/libretto-config/files/patch-libapm-e.man head/sysutils/libretto-config/files/patch-libapm.c head/sysutils/libretto-config/files/patch-libapm.h Modified: head/sysutils/libretto-config/Makefile ============================================================================== --- head/sysutils/libretto-config/Makefile Tue Mar 15 02:32:34 2016 (r411132) +++ head/sysutils/libretto-config/Makefile Tue Mar 15 02:36:04 2016 (r411133) @@ -16,11 +16,14 @@ ONLY_FOR_ARCHS= i386 WRKSRC= ${WRKDIR}/libapm USE_GCC= any -OPTIONS_DEFINE= DOCS PORTDOCS= * +OPTIONS_DEFINE= DOCS + post-install: - ${INSTALL_MAN} ${WRKSRC}/libapm-j.man ${STAGEDIR}${PREFIX}/man/ja/man8/${PORTNAME}.8 + ${INSTALL_MAN} ${WRKSRC}/libapm-j.man ${STAGEDIR}${MAN8PREFIX}/man/ja/man8/${PORTNAME}.8 + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README-e.1st ${STAGEDIR}${DOCSDIR}/README.1st ${INSTALL_DATA} ${WRKSRC}/APM-EXBIOS-e.txt ${STAGEDIR}${DOCSDIR}/APM-EXBIOS.txt Modified: head/sysutils/libretto-config/files/patch-Makefile ============================================================================== --- head/sysutils/libretto-config/files/patch-Makefile Tue Mar 15 02:32:34 2016 (r411132) +++ head/sysutils/libretto-config/files/patch-Makefile Tue Mar 15 02:36:04 2016 (r411133) @@ -30,7 +30,7 @@ $(PROGRAM): $(OBJ) $(CC) $(CFLAGS) -o $(PROGRAM) $(OBJ) -@@ -19,12 +20,12 @@ +@@ -19,12 +20,12 @@ $(PROGRAM): $(OBJ) clean: /bin/rm -f $(OBJ) $(PROGRAM) *~ Modified: head/sysutils/libretto-config/files/patch-libapm-e.man ============================================================================== --- head/sysutils/libretto-config/files/patch-libapm-e.man Tue Mar 15 02:32:34 2016 (r411132) +++ head/sysutils/libretto-config/files/patch-libapm-e.man Tue Mar 15 02:36:04 2016 (r411133) @@ -1,5 +1,5 @@ ---- libapm-e.man.orig Fri Jun 19 04:02:48 1998 -+++ libapm-e.man Thu Aug 2 17:34:01 2001 +--- libapm-e.man.orig 1998-06-19 03:02:48 UTC ++++ libapm-e.man @@ -1,80 +1,98 @@ .\" Written Tue May 12 19:30:00 1998 by ISHIOKA Takashi .\" (ishioka@ppp01.infopepper.or.jp ) Modified: head/sysutils/libretto-config/files/patch-libapm.c ============================================================================== --- head/sysutils/libretto-config/files/patch-libapm.c Tue Mar 15 02:32:34 2016 (r411132) +++ head/sysutils/libretto-config/files/patch-libapm.c Tue Mar 15 02:36:04 2016 (r411133) @@ -1,5 +1,5 @@ ---- libapm.c.orig Fri Jun 19 02:28:23 1998 -+++ libapm.c Sun Aug 22 23:31:55 2004 +--- libapm.c.orig 1998-06-19 00:28:23 UTC ++++ libapm.c @@ -8,12 +8,19 @@ /* */ /***********************************************************/ @@ -20,7 +20,7 @@ #include <fcntl.h> #include <unistd.h> #include <sys/mman.h> -@@ -63,6 +70,7 @@ +@@ -63,6 +70,7 @@ int main(int argc, char *argv[]) int r; char c; @@ -28,7 +28,7 @@ struct option longopts[] = { { "Help", 0, 0, 'h' }, { "Version", 0, 0, 'v' }, -@@ -78,6 +86,7 @@ +@@ -78,6 +86,7 @@ int main(int argc, char *argv[]) #endif /* CMOS_ACCESS */ {0, 0, 0, 0} }; @@ -36,7 +36,7 @@ if( 0 != geteuid() ){ printf("%s: Only root can execute !!\n", argv[0]); -@@ -98,8 +107,12 @@ +@@ -98,8 +107,12 @@ int main(int argc, char *argv[]) get_status(); @@ -49,7 +49,7 @@ switch (c) { case 'h': usage(); -@@ -189,7 +202,7 @@ +@@ -189,7 +202,7 @@ int main(int argc, char *argv[]) case '?': usage(); break; @@ -58,7 +58,7 @@ } } #ifdef DEBUG -@@ -215,29 +228,60 @@ +@@ -215,29 +228,60 @@ int main(int argc, char *argv[]) void usage(void) { #ifdef CMOS_ACCESS @@ -140,7 +140,7 @@ #endif /* CMOS_ACCESS */ exit(1); } -@@ -246,7 +290,11 @@ +@@ -246,7 +290,11 @@ usage: libapm [-v --Version] void init(void) { /* SMI port */ @@ -152,7 +152,7 @@ } #endif /* CMOS_ACCESS */ -@@ -754,29 +802,29 @@ +@@ -754,29 +802,29 @@ void print_status(void) #endif /* CMOS_ACCESS */ #ifndef CMOS_ACCESS Modified: head/sysutils/libretto-config/files/patch-libapm.h ============================================================================== --- head/sysutils/libretto-config/files/patch-libapm.h Tue Mar 15 02:32:34 2016 (r411132) +++ head/sysutils/libretto-config/files/patch-libapm.h Tue Mar 15 02:36:04 2016 (r411133) @@ -1,7 +1,6 @@ -diff -urN libapm.h.orig libapm.h ---- libapm.h.orig Tue May 12 11:05:49 1998 -+++ libapm.h Thu Nov 19 13:02:03 1998 -@@ -32,34 +32,44 @@ +--- libapm.h.orig 1998-05-12 02:05:49 UTC ++++ libapm.h +@@ -32,34 +32,44 @@ static inline int port_inw( int port ) #define outb(port, value) port_out(value, port) #define outw(port, value) port_outw(value, port)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603150236.u2F2a4tZ032960>