date:20161210

devel/doxygen: Split the gui off to a different port

2016-12-10 Thread Rafael Sadowski

Hi ports@,

based on the discussion [1] I would like to split doxygen in two
separate ports. Below you can see a diff to remove gui from current
port. Please find attached doxygen-gui tarball witch only include
doxywizard and doxywizard.1.

In conflict prevention, doxygen and doxygen-gui still have an REVISION
which was bumped up.

Best regards,

Rafael

[1]: https://marc.info/?l=openbsd-ports&m=147907369921343&w=2

Index: Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- Makefile13 Nov 2016 23:34:17 -  1.38
+++ Makefile10 Dec 2016 07:45:57 -
@@ -5,16 +5,12 @@
 NOT_FOR_ARCHS= m88k sh
 BROKEN-alpha=  .got subsegment exceeds 64K
 
-COMMENT-main=  source code documentation generator tool
-COMMENT-gui=   GUI front-end for doxygen
+COMMENT=   source code documentation generator tool
 
 VERSION=   1.8.12
 DISTNAME=  doxygen-${VERSION}.src
-PKGNAME-main=  doxygen-${VERSION}
-FULLPKGNAME-gui=doxygen-gui-${VERSION}
-
-REVISION-main= 0
-REVISION-gui=  0
+PKGNAME=   doxygen-gui-${VERSION}
+REVISION=  1
 
 CATEGORIES=devel textproc
 
@@ -25,21 +21,13 @@ MAINTAINER= Rafael Sadowski http://ftp.stack.nl/pub/users/dimitri/ \
ftp://ftp.stack.nl/pub/users/dimitri/
 
-MULTI_PACKAGES=-main -gui
-PSEUDO_FLAVORS=no_gui bootstrap
-
-WANTLIB-main +=c iconv m pthread stdc++ xapian z
-WANTLIB-gui += QtCore QtGui QtXml c m stdc++
-
-LIB_DEPENDS-main=  converters/libiconv \
-   databases/xapian-core
-
-LIB_DEPENDS-gui=   ${MODQT_LIB_DEPENDS}
-
-RUN_DEPENDS-gui= doxygen-${VERSION}:${BUILD_PKGPATH}
+LIB_DEPENDS=   converters/libiconv \
+   databases/xapian-core
 
 MODULES=   devel/cmake \
lang/python
@@ -47,11 +35,6 @@ MODULES= devel/cmake \
 MODPY_RUNDEP=  No
 
 .include 
-.if ${BUILD_PACKAGES:M-gui}
-CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
-CONFIGURE_ARGS+=-Dforce_qt4:Bool=ON
-MODULES+=  x11/qt4
-.endif
 .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
 # ld(1) fails
 CONFIGURE_ARGS+=-Denglish_only:Bool=ON
Index: patches/patch-addon_doxywizard_CMakeLists_txt
===
RCS file: patches/patch-addon_doxywizard_CMakeLists_txt
diff -N patches/patch-addon_doxywizard_CMakeLists_txt
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt1 Mar 2016 20:36:40 -   1.1
+++ patches/patch-doc_CMakeLists_txt10 Dec 2016 07:45:57 -
@@ -1,10 +1,12 @@
 $OpenBSD: patch-doc_CMakeLists_txt,v 1.1 2016/03/01 20:36:40 jca Exp $
 
--only manual pages
+- only manual pages
+- remove doxywizard.1, see devel/doxygen-gui
 
 doc/CMakeLists.txt.origTue Sep  1 14:42:06 2015
-+++ doc/CMakeLists.txt Sat Jan 16 22:00:23 2016
-@@ -153,13 +153,8 @@ add_custom_target(doxygen_pdf
+
+--- doc/CMakeLists.txt.origSun Sep  4 19:06:42 2016
 doc/CMakeLists.txt Fri Dec  9 22:52:29 2016
+@@ -153,33 +153,15 @@ add_custom_target(doxygen_pdf
  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/latex
  )
  add_custom_target(docs
@@ -18,10 +20,10 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.1
  VERBATIM
  )
  
-@@ -167,19 +162,7 @@ add_custom_target(docs
+ 

  install(FILES
  "${PROJECT_BINARY_DIR}/man/doxygen.1"
- "${PROJECT_BINARY_DIR}/man/doxywizard.1"
+-"${PROJECT_BINARY_DIR}/man/doxywizard.1"
 -"${PROJECT_BINARY_DIR}/man/doxysearch.1"
 -"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
 -DESTINATION share/man/man1
Index: patches/patch-libmd5_libmd5_pro_in
===
RCS file: patches/patch-libmd5_libmd5_pro_in
diff -N patches/patch-libmd5_libmd5_pro_in
Index: patches/patch-qtools_qtools_pro_in
===
RCS file: patches/patch-qtools_qtools_pro_in
diff -N patches/patch-qtools_qtools_pro_in
Index: patches/patch-src_CMakeLists_txt
===
RCS file: patches/patch-src_CMakeLists_txt
diff -N patches/patch-src_CMakeLists_txt
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/DESCR   10 Dec 2016 07:45:57 -
@@ -0,0 +1,37 @@
+Doxygen is a documentation system for C++, C, Java, Objective-C, IDL
+(Corba and Microsoft flavors) and to some extent PHP, C# and D.
+
+It can generate an on-line documentation browser (in HTML) and/or an
+off-line reference manual

Re: Kernel panic on 6.0-stable

2016-12-10 Thread Frank Groeneveld

On Fri, Dec 09, 2016 at 12:30:47AM +0100, Rafael Sadowski wrote:
> 
> Just for fun, diff below updates igmpproxy from beta2 (2005-09-13) to final
> (2009-10-05). I deleted all undocumented patches. Maybe this is a
> mistake, maybe not.
> 
> Frank, maybe it helps you.
> 
> Rafael
> 

Great, that fixes it, thank you!

Your patch needs some modifications before import though:

- the daemon now requires the config file as first argument, so the rc
  file needs that added.
- the version number you created (0.1p9) is not recognized as being
  higher thatn 0.1b2p8. I would opt for renaming this new one 0.1 and
  adding a quirk so that it would upgrade the 0.1 beta 2's to 0.1.

Thanks again!

Frank

Re: devel/doxygen: Split the gui off to a different port

2016-12-10 Thread Stuart Henderson


You need @pkgpath markers so that updates work.

--
 Sent from a phone, apologies for poor formatting.



On 10 December 2016 08:36:45 Rafael Sadowski  wrote:


Hi ports@,

based on the discussion [1] I would like to split doxygen in two
separate ports. Below you can see a diff to remove gui from current
port. Please find attached doxygen-gui tarball witch only include
doxywizard and doxywizard.1.

In conflict prevention, doxygen and doxygen-gui still have an REVISION
which was bumped up.

Best regards,

Rafael

[1]: https://marc.info/?l=openbsd-ports&m=147907369921343&w=2

Index: Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- Makefile13 Nov 2016 23:34:17 -  1.38
+++ Makefile10 Dec 2016 07:45:57 -
@@ -5,16 +5,12 @@
 NOT_FOR_ARCHS= m88k sh
 BROKEN-alpha=  .got subsegment exceeds 64K

-COMMENT-main=  source code documentation generator tool
-COMMENT-gui=   GUI front-end for doxygen
+COMMENT=   source code documentation generator tool

 VERSION=   1.8.12
 DISTNAME=  doxygen-${VERSION}.src
-PKGNAME-main=  doxygen-${VERSION}
-FULLPKGNAME-gui=doxygen-gui-${VERSION}
-
-REVISION-main= 0
-REVISION-gui=  0
+PKGNAME=   doxygen-gui-${VERSION}
+REVISION=  1

 CATEGORIES=devel textproc

@@ -25,21 +21,13 @@ MAINTAINER= Rafael Sadowski http://ftp.stack.nl/pub/users/dimitri/ \
ftp://ftp.stack.nl/pub/users/dimitri/

-MULTI_PACKAGES=-main -gui
-PSEUDO_FLAVORS=no_gui bootstrap
-
-WANTLIB-main +=c iconv m pthread stdc++ xapian z
-WANTLIB-gui += QtCore QtGui QtXml c m stdc++
-
-LIB_DEPENDS-main=  converters/libiconv \
-   databases/xapian-core
-
-LIB_DEPENDS-gui=   ${MODQT_LIB_DEPENDS}
-
-RUN_DEPENDS-gui= doxygen-${VERSION}:${BUILD_PKGPATH}
+LIB_DEPENDS=   converters/libiconv \
+   databases/xapian-core

 MODULES=   devel/cmake \
lang/python
@@ -47,11 +35,6 @@ MODULES= devel/cmake \
 MODPY_RUNDEP=  No

 .include 
-.if ${BUILD_PACKAGES:M-gui}
-CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
-CONFIGURE_ARGS+=-Dforce_qt4:Bool=ON
-MODULES+=  x11/qt4
-.endif
 .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
 # ld(1) fails
 CONFIGURE_ARGS+=-Denglish_only:Bool=ON
Index: patches/patch-addon_doxywizard_CMakeLists_txt
===
RCS file: patches/patch-addon_doxywizard_CMakeLists_txt
diff -N patches/patch-addon_doxywizard_CMakeLists_txt
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt1 Mar 2016 20:36:40 -   1.1
+++ patches/patch-doc_CMakeLists_txt10 Dec 2016 07:45:57 -
@@ -1,10 +1,12 @@
 $OpenBSD: patch-doc_CMakeLists_txt,v 1.1 2016/03/01 20:36:40 jca Exp $

--only manual pages
+- only manual pages
+- remove doxywizard.1, see devel/doxygen-gui

 doc/CMakeLists.txt.origTue Sep  1 14:42:06 2015
-+++ doc/CMakeLists.txt Sat Jan 16 22:00:23 2016
-@@ -153,13 +153,8 @@ add_custom_target(doxygen_pdf
+
+--- doc/CMakeLists.txt.origSun Sep  4 19:06:42 2016
 doc/CMakeLists.txt Fri Dec  9 22:52:29 2016
+@@ -153,33 +153,15 @@ add_custom_target(doxygen_pdf
  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/latex
  )
  add_custom_target(docs
@@ -18,10 +20,10 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.1
  VERBATIM
  )

-@@ -167,19 +162,7 @@ add_custom_target(docs
+ 


  install(FILES
  "${PROJECT_BINARY_DIR}/man/doxygen.1"
- "${PROJECT_BINARY_DIR}/man/doxywizard.1"
+-"${PROJECT_BINARY_DIR}/man/doxywizard.1"
 -"${PROJECT_BINARY_DIR}/man/doxysearch.1"
 -"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
 -DESTINATION share/man/man1
Index: patches/patch-libmd5_libmd5_pro_in
===
RCS file: patches/patch-libmd5_libmd5_pro_in
diff -N patches/patch-libmd5_libmd5_pro_in
Index: patches/patch-qtools_qtools_pro_in
===
RCS file: patches/patch-qtools_qtools_pro_in
diff -N patches/patch-qtools_qtools_pro_in
Index: patches/patch-src_CMakeLists_txt
===
RCS file: patches/patch-src_CMakeLists_txt
diff -N patches/patch-src_CMakeLists_txt
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/DESCR   10 Dec 2016 07:45:57 -
@@ -0,0 +1,37 @@
+Doxygen is a documentation system for C++, C, Java, Objective-C, IDL
+(Corba and

Re: U-Boot for AArch64

2016-12-10 Thread Patrick Wildt

On Sat, Dec 10, 2016 at 11:23:54AM +1100, Jonathan Gray wrote:
> On Tue, Dec 06, 2016 at 06:31:59PM +0100, Patrick Wildt wrote:
> > Hi,
> > 
> > now that we have an AArch64-capable toolchain for our arm64 efforts, we
> > can start compiling 64-bit u-boots.  Instead of creating another port
> > for that we can make u-boot create different packages depending on the
> > flavor.
> > 
> > To upgrade from u-boot to u-boot-arm we'd need a Quirk as well.
> > 
> > Patrick
> 
> Setting FULLPKGNAME like that allows both FLAVORS to be installed
> at the same time?  The pine64 discussions on the u-boot list seem

Yes, exactly.  The idea was to be able to be able to use both at the
same time.

> to be going in the direction of a 32 bit config for the SPL while
> still only having a 64 bit target for the main u-boot image.
> 
> And 'make update-plist' would additionally need
> 'FLAVOR=aarch64 make update-list' when updating u-boot?

Yes, that's true.  One pass with ARM, copy the list to PFRAG.arm,
another pass with aarch64, copy the list to PFRAG.aarch64.  It's
a bit of a hassle.

> The quirks package is going to have to be added to the list manually
> copied over into the arm packages directory until there are
> arm packages built.
> 
> > 
> > diff --git a/sysutils/u-boot/Makefile b/sysutils/u-boot/Makefile
> > index 2856581..5b966e1 100644
> > --- a/sysutils/u-boot/Makefile
> > +++ b/sysutils/u-boot/Makefile
> > @@ -1,7 +1,14 @@
> >  #  $OpenBSD: Makefile,v 1.10 2016/11/20 01:47:00 jsg Exp $
> >  
> > +FLAVORS=   aarch64 arm
> > +FLAVOR?=   arm
> > +
> >  COMMENT=   U-Boot firmware
> > -DISTNAME=  u-boot-2016.11
> > +VERSION=   2016.11
> > +DISTNAME=  u-boot-${VERSION}
> > +PKGNAME=   u-boot-${FLAVOR}-${VERSION}
> > +FULLPKGNAME=   ${PKGNAME}
> > +REVISION=  0
> >  CATEGORIES=sysutils
> >  HOMEPAGE=  http://www.denx.de/wiki/U-Boot
> >  MAINTAINER=Jonathan Gray 
> > @@ -13,12 +20,26 @@ MASTER_SITES=   ftp://ftp.denx.de/pub/u-boot/
> >  EXTRACT_SUFX=  .tar.bz2
> >  PKG_ARCH=  *
> >  
> > -BUILD_DEPENDS= devel/arm-none-eabi/gcc-linaro \
> > -   devel/dtc
> > -MAKE_ENV+= CROSS_COMPILE="arm-none-eabi-" KBUILD_VERBOSE=1
> > +BUILD_DEPENDS= devel/dtc
> > +MAKE_ENV=  KBUILD_VERBOSE=1
> > +
> > +.if "${FLAVOR}" == "aarch64"
> > +BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro,aarch64
> > +MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-"
> > +.elif "${FLAVOR}" == "arm"
> > +BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro
> > +MAKE_ENV+= CROSS_COMPILE="arm-none-eabi-"
> > +.endif
> > +
> >  USE_GMAKE= Yes
> >  NO_TEST=   Yes
> >  
> > +.if "${FLAVOR}" == "aarch64"
> > +BOARDS=\
> > +   dragonboard410c \
> > +   pine64_plus \
> > +   rpi_3
> > +.elif "${FLAVOR}" == "arm"
> >  BOARDS=\
> > omap3_beagle \
> > omap4_panda \
> > @@ -52,6 +73,7 @@ BOARDS=\
> > rpi_3_32b \
> > vexpress_ca15_tc2 \
> > vexpress_ca9x4
> > +.endif
> >  
> >  FILES=\
> > MLO \
> > diff --git a/sysutils/u-boot/patches/patch-tools_relocate-rela_c 
> > b/sysutils/u-boot/patches/patch-tools_relocate-rela_c
> > new file mode 100644
> > index 000..b4aeff8
> > --- /dev/null
> > +++ b/sysutils/u-boot/patches/patch-tools_relocate-rela_c
> > @@ -0,0 +1,19 @@
> > +$OpenBSD$
> > +--- tools/relocate-rela.c.orig Sat Nov  5 17:01:51 2016
> >  tools/relocate-rela.c  Sat Nov  5 17:05:23 2016
> > +@@ -50,6 +50,7 @@ static bool supported_rela(Elf64_Rela *rela)
> > +   }
> > + }
> > + 
> > ++#if !defined(__OpenBSD__)
> > + static inline uint64_t swap64(uint64_t val)
> > + {
> > +   return ((val >> 56) & 0x00ffULL) |
> > +@@ -61,6 +62,7 @@ static inline uint64_t swap64(uint64_t val)
> > +  ((val << 40) & 0x00ffULL) |
> > +  ((val << 56) & 0xff00ULL);
> > + }
> > ++#endif
> > + 
> > + #if __BYTE_ORDER == __LITTLE_ENDIAN
> > + static inline uint64_t be64(uint64_t val)
> > diff --git a/sysutils/u-boot/pkg/PFRAG.aarch64 
> > b/sysutils/u-boot/pkg/PFRAG.aarch64
> > new file mode 100644
> > index 000..0854fee
> > --- /dev/null
> > +++ b/sysutils/u-boot/pkg/PFRAG.aarch64
> > @@ -0,0 +1,12 @@
> > +@comment $OpenBSD$
> > +share/u-boot/
> > +share/u-boot/dragonboard410c/
> > +share/u-boot/dragonboard410c/u-boot
> > +share/u-boot/dragonboard410c/u-boot.bin
> > +share/u-boot/pine64_plus/
> > +share/u-boot/pine64_plus/u-boot
> > +share/u-boot/pine64_plus/u-boot.bin
> > +share/u-boot/pine64_plus/u-boot.img
> > +share/u-boot/rpi_3/
> > +share/u-boot/rpi_3/u-boot
> > +share/u-boot/rpi_3/u-boot.bin
> > diff --git a/sysutils/u-boot/pkg/PFRAG.arm b/sysutils/u-boot/pkg/PFRAG.arm
> > new file mode 100644
> > index 000..129a42f
> > --- /dev/null
> > +++ b/sysutils/u-boot/pkg/PFRAG.arm
> > @@ -0,0 +1,151 @@
> > +@comment $OpenBSD$
> > +share/u-boot/
> > +share/u-boot/A10-OLinuXino-Lime/
> > +share/u-boot/A10-OLinuXino-Lime/u-boot
> > +share/u-boot/A10-OLinuXino-Lime/u-boot-sunxi-with-spl.bin
> > +share/u-boot/A10-OLinuXino-Lime/u-boot.bin
> > +share/u-boot/A10-OLinuXi

Re: U-Boot for AArch64

2016-12-10 Thread Jonathan Gray

On Sat, Dec 10, 2016 at 06:14:11PM +0100, Patrick Wildt wrote:
> On Sat, Dec 10, 2016 at 11:23:54AM +1100, Jonathan Gray wrote:
> > On Tue, Dec 06, 2016 at 06:31:59PM +0100, Patrick Wildt wrote:
> > > Hi,
> > > 
> > > now that we have an AArch64-capable toolchain for our arm64 efforts, we
> > > can start compiling 64-bit u-boots.  Instead of creating another port
> > > for that we can make u-boot create different packages depending on the
> > > flavor.
> > > 
> > > To upgrade from u-boot to u-boot-arm we'd need a Quirk as well.
> > > 
> > > Patrick
> > 
> > Setting FULLPKGNAME like that allows both FLAVORS to be installed
> > at the same time?  The pine64 discussions on the u-boot list seem
> 
> Yes, exactly.  The idea was to be able to be able to use both at the
> same time.
> 
> > to be going in the direction of a 32 bit config for the SPL while
> > still only having a 64 bit target for the main u-boot image.
> > 
> > And 'make update-plist' would additionally need
> > 'FLAVOR=aarch64 make update-list' when updating u-boot?
> 
> Yes, that's true.  One pass with ARM, copy the list to PFRAG.arm,
> another pass with aarch64, copy the list to PFRAG.aarch64.  It's
> a bit of a hassle.

The relocate-rela.c patch won't work right on big endian systems
as __BYTE_ORDER and __LITTLE_ENDIAN won't be defined unless
u-boot's compiler.h is included.

I'm ok with your diff if you instead use the following,
which I'll try submit upstream:

$OpenBSD$
--- tools/relocate-rela.c.orig  Tue Dec  6 10:36:23 2016
+++ tools/relocate-rela.c   Sun Dec 11 14:15:57 2016
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include "compiler.h"
 
 #ifndef R_AARCH64_RELATIVE
 #define R_AARCH64_RELATIVE 1027
@@ -50,40 +51,6 @@ static bool supported_rela(Elf64_Rela *rela)
}
 }
 
-static inline uint64_t swap64(uint64_t val)
-{
-   return ((val >> 56) & 0x00ffULL) |
-  ((val >> 40) & 0xff00ULL) |
-  ((val >> 24) & 0x00ffULL) |
-  ((val >>  8) & 0xff00ULL) |
-  ((val <<  8) & 0x00ffULL) |
-  ((val << 24) & 0xff00ULL) |
-  ((val << 40) & 0x00ffULL) |
-  ((val << 56) & 0xff00ULL);
-}
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-static inline uint64_t be64(uint64_t val)
-{
-   return swap64(val);
-}
-
-static inline uint64_t le64(uint64_t val)
-{
-   return val;
-}
-#else
-static inline uint64_t le64(uint64_t val)
-{
-   return swap64(val);
-}
-
-static inline uint64_t be64(uint64_t val)
-{
-   return val;
-}
-#endif
-
 static bool read_num(const char *str, uint64_t *num)
 {
char *endptr;
@@ -148,9 +115,9 @@ int main(int argc, char **argv)
return 4;
}
 
-   swrela.r_offset = le64(rela.r_offset);
-   swrela.r_info = le64(rela.r_info);
-   swrela.r_addend = le64(rela.r_addend);
+   swrela.r_offset = cpu_to_le64(rela.r_offset);
+   swrela.r_info = cpu_to_le64(rela.r_info);
+   swrela.r_addend = cpu_to_le64(rela.r_addend);
 
if (!supported_rela(&swrela))
continue;

devel/doxygen: Split the gui off to a different port

Re: Kernel panic on 6.0-stable

Re: devel/doxygen: Split the gui off to a different port

Re: U-Boot for AArch64

Re: U-Boot for AArch64

5 matches

Site Navigation

Mail list logo

Footer information