SOURCES (DEVEL): fwbuilder-configure.patch - tweaked for 2.1.5 - b...
czarny
czarny at pld-linux.org
Wed Aug 30 19:53:42 CEST 2006
Author: czarny Date: Wed Aug 30 17:53:42 2006 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- tweaked for 2.1.5
- branched for devel
---- Files affected:
SOURCES:
fwbuilder-configure.patch (1.2 -> 1.2.2.1)
---- Diffs:
================================================================
Index: SOURCES/fwbuilder-configure.patch
diff -u SOURCES/fwbuilder-configure.patch:1.2 SOURCES/fwbuilder-configure.patch:1.2.2.1
--- SOURCES/fwbuilder-configure.patch:1.2 Mon Feb 21 11:04:02 2005
+++ SOURCES/fwbuilder-configure.patch Wed Aug 30 19:53:36 2006
@@ -1,6 +1,36 @@
---- fwbuilder-2.0.0/qmake.inc.in.orig 2004-07-03 08:55:34.000000000 +0200
-+++ fwbuilder-2.0.0/qmake.inc.in 2004-08-01 21:17:11.261871888 +0200
-@@ -4,7 +4,7 @@
+diff -urN fwbuilder-2.1.5.orig/doc/doc.pro fwbuilder-2.1.5/doc/doc.pro
+--- fwbuilder-2.1.5.orig/doc/doc.pro 2005-11-19 06:27:26.000000000 +0100
++++ fwbuilder-2.1.5/doc/doc.pro 2006-08-30 19:36:00.000000000 +0200
+@@ -52,16 +52,15 @@
+
+ doc.path = $(DDIR)$$DOCDIR
+
+-man.files = fwbedit21.1 \
+- fwblookup21.1 \
+- fwbuilder21.1 \
+- fwb_ipf21.1 \
+- fwb_ipfw21.1 \
+- fwb_ipt21.1 \
+- fwb_pf21.1 \
+-
+-# fwb_install.1 \
+-# fwb_compile_all.1 \
++man.files = fwbedit.1 \
++ fwblookup.1 \
++ fwbuilder.1 \
++ fwb_ipf.1 \
++ fwb_ipfw.1 \
++ fwb_ipt.1 \
++ fwb_pf.1 \
++ fwb_install.1 \
++ fwb_compile_all.1 \
+
+ man.path = $(DDIR)$$MANDIR/man1
+
+diff -urN fwbuilder-2.1.5.orig/qmake.inc.in fwbuilder-2.1.5/qmake.inc.in
+--- fwbuilder-2.1.5.orig/qmake.inc.in 2006-06-21 09:20:37.000000000 +0200
++++ fwbuilder-2.1.5/qmake.inc.in 2006-08-30 19:18:31.000000000 +0200
+@@ -6,7 +6,7 @@
TEMPLATE =app
DEFINES += $$(DEFINES)
@@ -9,7 +39,7 @@
LANGUAGE = C++
UI_DIR = ui
-@@ -30,7 +30,7 @@
+@@ -27,7 +27,7 @@
res_os.path = $(DDIR)@RES_DIR@/os
res_platform.path = $(DDIR)@RES_DIR@/platform
@@ -17,4 +47,144 @@
+ CONFIG += qt thread rtti stl warn_on
INCLUDEPATH += @LIBFWBUILDER_INCLUDEPATH@
- LIBS += $$LIBS_FWBUILDER
+ LIBS += $$LIBS_FWBUILDER @LIBS@
+diff -urN fwbuilder-2.1.5.orig/qmake.inc.in.orig fwbuilder-2.1.5/qmake.inc.in.orig
+--- fwbuilder-2.1.5.orig/qmake.inc.in.orig 1970-01-01 01:00:00.000000000 +0100
++++ fwbuilder-2.1.5/qmake.inc.in.orig 2006-06-21 09:20:37.000000000 +0200
+@@ -0,0 +1,48 @@
++#-*- mode: makefile; tab-width: 4; -*-
++#
++######### fwbuilder2/qmake.inc.in
++#
++
++TEMPLATE =app
++
++DEFINES += $$(DEFINES)
++INCLUDEPATH += ../.. $$(INCLUDEPATH)
++LANGUAGE = C++
++UI_DIR = ui
++
++unix {
++!macx {
++ UI_DIR = .ui
++ MOC_DIR = .moc
++ OBJECTS_DIR = .obj
++
++ PREFIX = @PREFIX@
++ DOCDIR = @DOCDIR@
++ MANDIR = @MANDIR@
++ LIBS_FWCOMPILER = @LIBFWBUILDER_LIBS_FWCOMPILER@
++ LIBS_FWBUILDER = @LIBFWBUILDER_LIBS_FWBUILDER@
++
++ target.path = $(DDIR)$$PREFIX/bin
++ res.path = $(DDIR)@RES_DIR@
++ res_os.path = $(DDIR)@RES_DIR@/os
++ res_platform.path = $(DDIR)@RES_DIR@/platform
++
++ CONFIG += qt thread rtti stl warn_on debug
++ INCLUDEPATH += @LIBFWBUILDER_INCLUDEPATH@
++
++ LIBS += $$LIBS_FWBUILDER @LIBS@
++
++ PKGLOCALEDIR = $$res.path/locale
++
++ QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
++ QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
++ QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
++ QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
++}
++}
++
++exists(qmake2.inc) {
++ include( qmake2.inc)
++}
++
++INSTALLS += target
+diff -urN fwbuilder-2.1.5.orig/src/fwbedit/fwbedit.pro fwbuilder-2.1.5/src/fwbedit/fwbedit.pro
+--- fwbuilder-2.1.5.orig/src/fwbedit/fwbedit.pro 2005-07-31 07:42:22.000000000 +0200
++++ fwbuilder-2.1.5/src/fwbedit/fwbedit.pro 2006-08-30 19:18:41.000000000 +0200
+@@ -6,7 +6,7 @@
+ SOURCES = fwbedit.cpp
+ HEADERS = ../../config.h
+
+-TARGET = fwbedit21
++TARGET = fwbedit
+
+ QMAKE_COPY = ../../install.sh -m 0755 -s
+
+diff -urN fwbuilder-2.1.5.orig/src/fwblookup/fwblookup.pro fwbuilder-2.1.5/src/fwblookup/fwblookup.pro
+--- fwbuilder-2.1.5.orig/src/fwblookup/fwblookup.pro 2005-07-31 07:42:22.000000000 +0200
++++ fwbuilder-2.1.5/src/fwblookup/fwblookup.pro 2006-08-30 19:18:46.000000000 +0200
+@@ -6,7 +6,7 @@
+ SOURCES = fwblookup.cpp
+ HEADERS = ../../config.h
+
+-TARGET = fwblookup21
++TARGET = fwblookup
+
+ QMAKE_COPY = ../../install.sh -m 0755 -s
+
+diff -urN fwbuilder-2.1.5.orig/src/gui/gui.pro fwbuilder-2.1.5/src/gui/gui.pro
+--- fwbuilder-2.1.5.orig/src/gui/gui.pro 2006-06-03 20:32:21.000000000 +0200
++++ fwbuilder-2.1.5/src/gui/gui.pro 2006-08-30 19:18:59.000000000 +0200
+@@ -418,7 +418,7 @@
+ #
+ #
+ #
+-TARGET = fwbuilder21
++TARGET = fwbuilder
+ #
+
+ #unix {
+diff -urN fwbuilder-2.1.5.orig/src/ipf/ipf.pro fwbuilder-2.1.5/src/ipf/ipf.pro
+--- fwbuilder-2.1.5.orig/src/ipf/ipf.pro 2005-07-31 07:42:22.000000000 +0200
++++ fwbuilder-2.1.5/src/ipf/ipf.pro 2006-08-30 19:19:05.000000000 +0200
+@@ -25,4 +25,4 @@
+
+ LIBS += $$LIBS_FWCOMPILER
+
+-TARGET = fwb_ipf21
++TARGET = fwb_ipf
+diff -urN fwbuilder-2.1.5.orig/src/ipfw/ipfw.pro fwbuilder-2.1.5/src/ipfw/ipfw.pro
+--- fwbuilder-2.1.5.orig/src/ipfw/ipfw.pro 2005-07-31 07:42:23.000000000 +0200
++++ fwbuilder-2.1.5/src/ipfw/ipfw.pro 2006-08-30 19:19:14.000000000 +0200
+@@ -25,4 +25,4 @@
+
+ LIBS += $$LIBS_FWCOMPILER
+
+-TARGET = fwb_ipfw21
++TARGET = fwb_ipfw
+diff -urN fwbuilder-2.1.5.orig/src/ipt/ipt.pro fwbuilder-2.1.5/src/ipt/ipt.pro
+--- fwbuilder-2.1.5.orig/src/ipt/ipt.pro 2006-01-04 05:11:58.000000000 +0100
++++ fwbuilder-2.1.5/src/ipt/ipt.pro 2006-08-30 19:19:26.000000000 +0200
+@@ -33,7 +33,7 @@
+
+ win32:CONFIG += console
+
+-TARGET = fwb_ipt21
++TARGET = fwb_ipt
+
+ LIBS += $$LIBS_FWCOMPILER
+
+diff -urN fwbuilder-2.1.5.orig/src/pf/pf.pro fwbuilder-2.1.5/src/pf/pf.pro
+--- fwbuilder-2.1.5.orig/src/pf/pf.pro 2005-07-31 07:42:23.000000000 +0200
++++ fwbuilder-2.1.5/src/pf/pf.pro 2006-08-30 19:19:35.000000000 +0200
+@@ -23,4 +23,4 @@
+
+ LIBS += $$LIBS_FWCOMPILER
+
+-TARGET = fwb_pf21
++TARGET = fwb_pf
+diff -urN fwbuilder-2.1.5.orig/src/src.pro fwbuilder-2.1.5/src/src.pro
+--- fwbuilder-2.1.5.orig/src/src.pro 2005-07-31 07:42:22.000000000 +0200
++++ fwbuilder-2.1.5/src/src.pro 2006-08-30 19:28:20.000000000 +0200
+@@ -6,7 +6,8 @@
+ CONFIG += ordered
+
+ TARGET = src
+-SUBDIRS = res fwbedit fwblookup gui ipt pflib pf ipf ipfw
++SUBDIRS = res fwbedit fwblookup gui ipt tools pflib pf ipf ipfw
+ # NOTE: 2.1 does not install scripts from src/tools ( fwb_install , fwb_compile_all)
++# PLD: but we do :D
+
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/fwbuilder-configure.patch?r1=1.2&r2=1.2.2.1&f=u
More information about the pld-cvs-commit
mailing list