Attachment #98428 for bug #137347

Lines 6-12 Link Here

(-)x11-toolkits/qt4pas/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= qt4pas	8	PORTNAME= qt4pas
9	PORTVERSION= 1.68	9	PORTVERSION= 1.70
10	CATEGORIES= x11-toolkits	10	CATEGORIES= x11-toolkits
11	MASTER_SITES= http://users.telenet.be/Jan.Van.hijfte/qtforfpc/	11	MASTER_SITES= http://users.telenet.be/Jan.Van.hijfte/qtforfpc/
12	DISTNAME= ${PORTNAME}-${PORTVERSION:S/^/V/}_Qt${QT4_VER_MIN}	12	DISTNAME= ${PORTNAME}-${PORTVERSION:S/^/V/}_Qt${QT4_VER_MIN}
Lines 18-24 Link Here
18	USE_QT_VER= 4	18	USE_QT_VER= 4
19	QT_COMPONENTS= corelib gui	19	QT_COMPONENTS= corelib gui
20		20
21	QT4_VER_MIN= 4.4.3	21	QT4_VER_MIN= 4.5.0
22		22
23	.include <bsd.port.pre.mk>	23	.include <bsd.port.pre.mk>
24		24

Lines 1-3 Link Here

(-)x11-toolkits/qt4pas/distinfo (-3 / +3 lines)
1	MD5 (qt4pas-V1.68_Qt4.4.3.tar.gz) = a1b4d51ab85d38126349ce94dbfc6ca8	1	MD5 (qt4pas-V1.70_Qt4.5.0.tar.gz) = 1b44cd72a6c226524a54afe93b68ecb8
2	SHA256 (qt4pas-V1.68_Qt4.4.3.tar.gz) = b9b5e2725c221f8feae35407186e58b851481aea08291c7f85c1bf1f8721d668	2	SHA256 (qt4pas-V1.70_Qt4.5.0.tar.gz) = d20c6cf48b854074a5449e621aaf1f3fde7d38f13abb945887ef9b642fcbd01e
3	SIZE (qt4pas-V1.68_Qt4.4.3.tar.gz) = 352932	3	SIZE (qt4pas-V1.70_Qt4.5.0.tar.gz) = 403932




--- compile_lib.sh	2009-04-21 00:59:59.000000000 +1100
+++ compile_lib.sh	2009-08-02 20:19:26.000000000 +1100
@@ -7,18 +7,16 @@
 # do configure and gmake in that Qt4 dir
 
 NAME=libqt4intf.so
-QTDIR=../qt-all-opensource-src-4.5.0
-INCLUDE_PATH="-I. -I$QTDIR/include -I$QTDIR/include/Qt -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore -Iqlcl "
-LIB_PATH=$QTDIR/lib
-export LD_LIBRARY_PATH=$LIB_PATH
+QTDIR=%%QT_INCDIR%%
+INCLUDE_PATH="-I. -I$QTDIR -I$QTDIR/Qt -I$QTDIR/QtGui -I$QTDIR/QtCore -Iqlcl "
+LIB_PATH=%%QT_LIBDIR%%
 export LD_LIBRARY_PATH=$LIB_PATH
 if [ -e "$LIB_PATH/libQtCore.so.4" ]
 then
   echo please wait for compile to finish ...
-  g++ -D BINUX $INCLUDE_PATH qtpas.cpp -o libqt4intf.so -shared -fPIC -lQtCore -lQtGui -lQtNetwork -lQtWebKit  -Xlinker -soname=$NAME -Xlinker --library-path -Xlinker $LIB_PATH
-  echo Showing used Qt libraries when LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-  ldd $NAME | grep libQt
+  %%CXX%% -D BINUX $INCLUDE_PATH qtpas.cpp -o libqt4intf.so -shared -fPIC -lQtCore -lQtGui -lQtNetwork -lQtWebKit  -Xlinker -soname=$NAME -Xlinker --library-path -Xlinker $LIB_PATH
   echo stripping library
-  strip --strip-all $NAME
+  %%STRIP_CMD%% --strip-all $NAME

Return to bug 137347

Lines 1-24 Link Here

(-)x11-toolkits/qt4pas/files/patch-compile_lib.sh (-7 / +6 lines)
1	--- compile_lib.sh 2009-01-21 20:18:56.000000000 -0500	1	--- compile_lib.sh 2009-04-21 00:59:59.000000000 +1100
2	+++ compile_lib.sh 2009-01-21 20:20:21.000000000 -0500	2	+++ compile_lib.sh 2009-08-02 20:19:26.000000000 +1100
3	@@ -7,18 +7,16 @@	3	@@ -7,18 +7,16 @@
4	# do configure and gmake in that Qt4 dir	4	# do configure and gmake in that Qt4 dir
5		5
6	NAME=libqt4intf.so	6	NAME=libqt4intf.so
7	-QTDIR=../qt-x11-opensource-src-4.4.3	7	-QTDIR=../qt-all-opensource-src-4.5.0
8	-INCLUDE_PATH="-I. -I$QTDIR/include -I$QTDIR/include/Qt -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore -Iqlcl "	8	-INCLUDE_PATH="-I. -I$QTDIR/include -I$QTDIR/include/Qt -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore -Iqlcl "
9	-LIB_PATH=$QTDIR/lib	9	-LIB_PATH=$QTDIR/lib
10	-export LD_LIBRARY_PATH=$LIB_PATH
11	+QTDIR=%%QT_INCDIR%%	10	+QTDIR=%%QT_INCDIR%%
12	+INCLUDE_PATH="-I. -I$QTDIR -I$QTDIR/Qt -I$QTDIR/QtGui -I$QTDIR/QtCore -Iqlcl "	11	+INCLUDE_PATH="-I. -I$QTDIR -I$QTDIR/Qt -I$QTDIR/QtGui -I$QTDIR/QtCore -Iqlcl "
13	+LIB_PATH=%%QT_LIBDIR%%	12	+LIB_PATH=%%QT_LIBDIR%%
14	+	13	export LD_LIBRARY_PATH=$LIB_PATH
15	if [ -e "$LIB_PATH/libQtCore.so.4" ]	14	if [ -e "$LIB_PATH/libQtCore.so.4" ]
16	then	15	then
17	echo please wait for compile to finish ...	16	echo please wait for compile to finish ...
18	- g++ -D BINUX $INCLUDE_PATH qtpas.cpp -o libqt4intf.so -shared -fPIC -lQtCore -lQtGui -Xlinker -soname=$NAME -Xlinker --library-path -Xlinker $LIB_PATH	17	- g++ -D BINUX $INCLUDE_PATH qtpas.cpp -o libqt4intf.so -shared -fPIC -lQtCore -lQtGui -lQtNetwork -lQtWebKit -Xlinker -soname=$NAME -Xlinker --library-path -Xlinker $LIB_PATH
19	- echo Showing used Qt libraries when LD_LIBRARY_PATH=$LD_LIBRARY_PATH	18	- echo Showing used Qt libraries when LD_LIBRARY_PATH=$LD_LIBRARY_PATH
20	- ldd $NAME \| grep libQt	19	- ldd $NAME \| grep libQt
21	+ %%CXX%% -D BINUX $INCLUDE_PATH qtpas.cpp -o libqt4intf.so -shared -fPIC -lQtCore -lQtGui -Xlinker -soname=$NAME -Xlinker --library-path -Xlinker $LIB_PATH	20	+ %%CXX%% -D BINUX $INCLUDE_PATH qtpas.cpp -o libqt4intf.so -shared -fPIC -lQtCore -lQtGui -lQtNetwork -lQtWebKit -Xlinker -soname=$NAME -Xlinker --library-path -Xlinker $LIB_PATH
22	echo stripping library	21	echo stripping library
23	- strip --strip-all $NAME	22	- strip --strip-all $NAME
24	+ %%STRIP_CMD%% --strip-all $NAME	23	+ %%STRIP_CMD%% --strip-all $NAME