Conformal Systems Support

Please bring new discussion to Github

You are not logged in.

#1 2012-08-29 05:06:21

Zplay
Member
Registered: 2012-08-29
Posts: 18

DragonflyBSD port (with patch)

Hi

I'm not at all a C developer but I enjoy Xombrero so much that I tried to hack it to make it compile on Dragonfly BSD.

I copied the freebsd Makefile and added "-lX11" in the LDADD.
I copied freebsd.c as dragonfly.c.


I'm not sure the util.h is clean, I did copy-paste from the linux files until it compiles...

Please find the patch here : http://pastebin.com/2QHvcXGr (made with git diff --cached)


I used the git version cda5a4c8462733e9b44276f3be8c44e3c596b9f7

I tried to make it the most clean possible, I hope it's good.


Kind regards

Last edited by Zplay (2012-08-29 05:08:44)

Offline

#2 2012-08-29 09:35:41

jrick
Member
Registered: 2012-05-17
Posts: 42

Re: DragonflyBSD port (with patch)

Hi, thanks for the patch.  we would love to get this in but the patch (both ftp'ing the raw patch and using pastebin's download feature) gives us a ton of \r's after the newlines.  Not sure if it's pastebin or the patch you uploaded, but could you get us a patch without those carriage returns?

Offline

#3 2012-08-29 10:16:40

jrick
Member
Registered: 2012-05-17
Posts: 42

Re: DragonflyBSD port (with patch)

I went ahead and took care of the carriage returns myself.  Can you pull the jrick.dbsd branch and make sure everything builds fine?

Offline

#4 2012-08-29 13:19:00

Zplay
Member
Registered: 2012-08-29
Posts: 18

Re: DragonflyBSD port (with patch)

Sorry for the problem in the patch.
Apparently, the patch of xombrero.h had not been applied.

diff --git a/xombrero.h b/xombrero.h
index df8306a..9365f73 100644
--- a/xombrero.h
+++ b/xombrero.h
@@ -50,6 +50,15 @@ u_int32_t    arc4random_uniform(u_int32_t);
 #include <sys/un.h>
 #include <sys/param.h>
 #define LOGIN_NAME_MAX MAXLOGNAME
+#elif defined(__DragonFly__)
+#include <sys/param.h>
+#include <sys/un.h>
+#include <sys/param.h>
+#include <libutil.h>
+#include "dragonfly/util.h"
+#include <sys/tree.h>
+#include <X11/Xlib.h>
+#define LOGIN_NAME_MAX MAXLOGNAME
 #elif defined(__OpenBSD__)
 #include <util.h>
 #include <sys/tree.h>

Last edited by Zplay (2012-08-29 13:23:11)

Offline

#5 2012-08-29 13:48:20

jrick
Member
Registered: 2012-05-17
Posts: 42

Re: DragonflyBSD port (with patch)

patched.. does that branch build now?

Offline

#6 2012-08-29 14:29:06

Zplay
Member
Registered: 2012-08-29
Posts: 18

Re: DragonflyBSD port (with patch)

jrick wrote:

patched.. does that branch build now?

It works ! :)
[img]http://img341.imageshack.us/img341/8672/captureahi.jpg[/img]

Offline

#7 2012-08-29 14:44:10

jrick
Member
Registered: 2012-05-17
Posts: 42

Re: DragonflyBSD port (with patch)

Thanks, applied this to the master branch.

Also I can tell from your screenshot that either you did not install xombrero, or you didn't set up your resource_dir option correctly (if you installed it to somewhere else), so you should fix that.

Offline

#8 2012-08-30 02:25:54

Zplay
Member
Registered: 2012-08-29
Posts: 18

Re: DragonflyBSD port (with patch)

jrick wrote:

Thanks, applied this to the master branch.

Also I can tell from your screenshot that either you did not install xombrero, or you didn't set up your resource_dir option correctly (if you installed it to somewhere else), so you should fix that.

Yes it was launched from the sources directory ;)

Thanks for having merged my patch ! This is my first one ! ^^

Offline

#9 2012-09-04 04:53:37

Zplay
Member
Registered: 2012-08-29
Posts: 18

Re: DragonflyBSD port (with patch)

Could you apply this patch ?
Is there another way to send you patches ?

--- dragonfly/Makefile.orig     2012-08-31 13:25:32.000000000 +0000
+++ dragonfly/Makefile  2012-09-04 11:51:09.476094000 +0000
@@ -16,8 +16,7 @@
 BINDIR?= $(PREFIX)/bin
 LIBDIR?= $(PREFIX)/lib
 MANDIR?= $(PREFIX)/man
-#SRCS= $(shell ls ../*.c)
-#SRCS+= dragonfly.c
+RESDIR?= $(PREFIX)/share/xombrero/
 
 CC= cc
 
@@ -69,6 +68,7 @@
        install -m 755 -d $(DESTDIR)$(BINDIR)
        install -m 755 -d $(DESTDIR)$(LIBDIR)
        install -m 755 -d $(DESTDIR)$(MANDIR)/man1
+       install -m 755 -d $(DESTDIR)$(RESDIR)
        install -m 755 xombrero $(DESTDIR)$(BINDIR)
        install -m 644 ../xombrero.1 $(DESTDIR)$(MANDIR)/man1/xombrero.1
        install -m 644 ../xombrero.css $(DESTDIR)$(RESDIR)

Aos, Xombrero has been added into pkgsrc-wip

Offline

#10 2012-09-05 08:16:43

jrick
Member
Registered: 2012-05-17
Posts: 42

Re: DragonflyBSD port (with patch)

fixed

Offline

#11 2012-09-06 14:01:19

Zplay
Member
Registered: 2012-08-29
Posts: 18

Re: DragonflyBSD port (with patch)

Hi

Only a part of the patch has been applied : https://opensource.conformal.com/viewgi … aa1bf2d6db


This is missing :

-#SRCS= $(shell ls ../*.c)
-#SRCS+= dragonfly.c
+RESDIR?= $(PREFIX)/share/xombrero/


Next time I'll provide hosted diff files :)

Last edited by Zplay (2012-09-06 14:01:42)

Offline

#12 2012-09-06 15:59:22

jrick
Member
Registered: 2012-05-17
Posts: 42

Re: DragonflyBSD port (with patch)

Oops, should be ok now.

Offline

#13 2012-09-06 16:01:57

Zplay
Member
Registered: 2012-08-29
Posts: 18

Re: DragonflyBSD port (with patch)

jrick wrote:

Oops, should be ok now.

thank you it seems good now =)

Offline

#14 2013-07-18 04:35:50

marole
Member
Registered: 2013-07-18
Posts: 3

Re: DragonflyBSD port (with patch)

thank you


_______________________
Aion Gold|Swtor gold|Age Of Wushu Gold

Offline

Board footer

Powered by FluxBB