Attachment #165705 for bug #203939

Lines 2-9 Link Here

(-)/usr/ports/www/xombrero/Makefile (-3 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xombrero	4	PORTNAME= xombrero
5	PORTVERSION= 1.6.3	5	PORTVERSION= 1.6.4
6	PORTREVISION= 2	6	PORTREVISION= 1
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= https://opensource.conformal.com/snapshots/xombrero/	8	MASTER_SITES= https://opensource.conformal.com/snapshots/xombrero/
9		9
Lines 15-21 Link Here
15	LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \	15	LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
16	libsoup-2.4.so:${PORTSDIR}/devel/libsoup	16	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
17		17
18	USES= pkgconfig perl5 tar:tgz	18	USES= desktop-file-utils pkgconfig perl5 tar:tgz
19	USE_PERL5= build	19	USE_PERL5= build
20	INSTALLS_ICONS= yes	20	INSTALLS_ICONS= yes
21		21

Lines 1-2 Link Here

(-)/usr/ports/www/xombrero/distinfo (-2 / +2 lines)
1	SHA256 (xombrero-1.6.3.tgz) = 481011c136206f7aa3ab4cdf49ad77f81df4d5585f9e9a20c651bfaaaa537f79	1	SHA256 (xombrero-1.6.4.tgz) = 3d818d22fa4b4fd6625522a8901ea695bbf6ae79074f4ec55a1ee16fdc5d2fd9
2	SIZE (xombrero-1.6.3.tgz) = 290478	2	SIZE (xombrero-1.6.4.tgz) = 482984




--- freebsd/Makefile.orig	2015-10-21 19:20:26.837048745 +0200
+++ freebsd/Makefile	2015-10-21 19:25:21.438026509 +0200
@@ -62,7 +62,7 @@ tldlist.o: ../tldlist.o
 xombrero: xombrero.o freebsd.o marco.o about.o inspector.o whitelist.o settings.o \
 	cookie.o history.o completion.o inputfocus.o tldlist.o externaleditor.o \
 	unix.o
-	$(CC) $(LDFLAGS) -o $@ *.o $+ $(LDADD)
+	$(CC) $(LDFLAGS) -o $@ ../*.o *.o $+ $(LDADD)
 LDFLAGS+= $(GTK_LDFLAGS)
 
 install: all
 	install -m 755 -d $(DESTDIR)$(BINDIR)

Return to bug 203939

Lines 1-11 Link Here

(-)/usr/ports/www/xombrero/files/patch-freebsd__Makefile (-10 / +10 lines)
1	--- freebsd/Makefile.orig 2013-12-08 20:54:46.651261821 +0100	1	--- freebsd/Makefile.orig 2015-10-21 19:20:26.837048745 +0200
2	+++ freebsd/Makefile 2013-12-08 20:55:15.418253611 +0100	2	+++ freebsd/Makefile 2015-10-21 19:25:21.438026509 +0200
3	@@ -9,7 +9,7 @@	3	@@ -62,7 +62,7 @@ tldlist.o: ../tldlist.o
4	LDADD= -lutil	4	xombrero: xombrero.o freebsd.o marco.o about.o inspector.o whitelist.o settings.o \
5	GTK_CFLAGS!= pkgconf --cflags $(LIBS)	5	cookie.o history.o completion.o inputfocus.o tldlist.o externaleditor.o \
6	GTK_LDFLAGS!= pkgconf --libs $(LIBS)	6	unix.o
7	-CFLAGS+= $(GTK_CFLAGS) -O2 -Wall -I. -I..	7	- $(CC) $(LDFLAGS) -o $@ *.o $+ $(LDADD)
8	+CFLAGS+= $(GTK_CFLAGS) -Wall -I. -I..	8	+ $(CC) $(LDFLAGS) -o $@ ../.o .o $+ $(LDADD)
9	LDFLAGS+= $(GTK_LDFLAGS)
10		9
11	PREFIX?= /usr/local	10	install: all
		11	install -m 755 -d $(DESTDIR)$(BINDIR)