- Switch to options helpers

- Regenerate patches with `make makepatch`

5 files changed, 20 insertions, 18 deletions

diff --git a/sysutils/libretto-config/Makefile b/sysutils/libretto-config/Makefile
index 5a169098b34..eb666322953 100644
--- a/sysutils/libretto-config/Makefile
+++ b/sysutils/libretto-config/Makefile
@@ -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
diff --git a/sysutils/libretto-config/files/patch-Makefile b/sysutils/libretto-config/files/patch-Makefile
index a7e4a999bcb..0c5aea7230e 100644
--- a/sysutils/libretto-config/files/patch-Makefile
+++ b/sysutils/libretto-config/files/patch-Makefile
@@ -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) *~ 
  
diff --git a/sysutils/libretto-config/files/patch-libapm-e.man b/sysutils/libretto-config/files/patch-libapm-e.man
index 1970beb4513..1223eb8138b 100644
--- a/sysutils/libretto-config/files/patch-libapm-e.man
+++ b/sysutils/libretto-config/files/patch-libapm-e.man
@@ -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 )
diff --git a/sysutils/libretto-config/files/patch-libapm.c b/sysutils/libretto-config/files/patch-libapm.c
index e7b1658ed94..be962e74737 100644
--- a/sysutils/libretto-config/files/patch-libapm.c
+++ b/sysutils/libretto-config/files/patch-libapm.c
@@ -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
diff --git a/sysutils/libretto-config/files/patch-libapm.h b/sysutils/libretto-config/files/patch-libapm.h
index d94a072d4b2..f4e146e58f1 100644
--- a/sysutils/libretto-config/files/patch-libapm.h
+++ b/sysutils/libretto-config/files/patch-libapm.h
@@ -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)