svn commit: r407669 - in head/emulators/gxemul: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Sun Jan 31 21:46:24 2016
New Revision: 407669
URL: https://svnweb.freebsd.org/changeset/ports/407669

Log:
  - Switch to options helpers
  - Regenerate patches with `make makepatch`

Added:
  head/emulators/gxemul/files/patch-src_devices_dev__wdc.cc
     - copied, changed from r407668, head/emulators/gxemul/files/patch-src_devices_dev_wdc.cc
  head/emulators/gxemul/files/patch-src_include_refcount__ptr.h
     - copied, changed from r407668, head/emulators/gxemul/files/patch-src_include_refcount_ptr.h
Deleted:
  head/emulators/gxemul/files/patch-src_devices_dev_wdc.cc
  head/emulators/gxemul/files/patch-src_include_refcount_ptr.h
Modified:
  head/emulators/gxemul/Makefile

Modified: head/emulators/gxemul/Makefile
==============================================================================
--- head/emulators/gxemul/Makefile	Sun Jan 31 21:46:19 2016	(r407668)
+++ head/emulators/gxemul/Makefile	Sun Jan 31 21:46:24 2016	(r407669)
@@ -40,10 +40,12 @@ post-patch:
 		 /CXXFLAGS=/s|-f[a-zA-Z-]+||g' ${WRKSRC}/configure
 
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} gxemul \
-		${STAGEDIR}${PREFIX}/bin)
-	(cd ${WRKSRC}/man && ${INSTALL_MAN} gxemul.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1)
+	${INSTALL_PROGRAM} ${WRKSRC}/gxemul \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/gxemul.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${DOCSDIR})

Copied and modified: head/emulators/gxemul/files/patch-src_devices_dev__wdc.cc (from r407668, head/emulators/gxemul/files/patch-src_devices_dev_wdc.cc)
==============================================================================
--- head/emulators/gxemul/files/patch-src_devices_dev_wdc.cc	Sun Jan 31 21:46:19 2016	(r407668, copy source)
+++ head/emulators/gxemul/files/patch-src_devices_dev__wdc.cc	Sun Jan 31 21:46:24 2016	(r407669)
@@ -1,6 +1,6 @@
---- src/devices/dev_wdc.cc.orig	2013-06-27 18:10:50.000000000 -0700
-+++ src/devices/dev_wdc.cc	2013-06-27 18:11:13.000000000 -0700
-@@ -274,12 +274,12 @@
+--- src/devices/dev_wdc.cc.orig	2014-08-17 08:45:12 UTC
++++ src/devices/dev_wdc.cc
+@@ -274,12 +274,12 @@ void wdc__read(struct cpu *cpu, struct w
  	    + (int64_t)d->head * d->sectors_per_track[d->drive] +
  	    (int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);
  
@@ -15,7 +15,7 @@
  #endif
  
  	while (count > 0) {
-@@ -320,12 +320,12 @@
+@@ -320,12 +320,12 @@ void wdc__write(struct cpu *cpu, struct 
  	uint64_t offset = 512 * (d->sector - 1
  	    + (int64_t)d->head * d->sectors_per_track[d->drive] +
  	    (int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);

Copied and modified: head/emulators/gxemul/files/patch-src_include_refcount__ptr.h (from r407668, head/emulators/gxemul/files/patch-src_include_refcount_ptr.h)
==============================================================================
--- head/emulators/gxemul/files/patch-src_include_refcount_ptr.h	Sun Jan 31 21:46:19 2016	(r407668, copy source)
+++ head/emulators/gxemul/files/patch-src_include_refcount__ptr.h	Sun Jan 31 21:46:24 2016	(r407669)
@@ -1,8 +1,8 @@
---- src/include/refcount_ptr.h	2010-02-14 02:33:54.000000000 -0700
-+++ src/include/refcount_ptr.h	2014-02-24 03:48:14.000000000 -0700
-@@ -28,6 +28,8 @@
-  *  SUCH DAMAGE.
-  */
+--- src/include/refcount_ptr.h.orig	2014-08-17 08:45:13 UTC
++++ src/include/refcount_ptr.h
+@@ -33,6 +33,8 @@ template <class T>
+ class refcount_ptr;
+ 
  
 +#include <stddef.h>
 +