Attachment #21130 for bug #37093

View | Details | Raw Unified | Return to bug 37093
Collapse All | Expand All




#

PORTNAME=	qterm
PORTVERSION=	0.1.4
CATEGORIES=	chinese
MASTER_SITES=	http://qterm.gnuchina.org/qterm-0.1.4/ \
		ftp://freebsd.sinica.edu.tw/pub/statue/qterm/
DISTNAME=	${PORTNAME}-${PORTVERSION}-1

MAINTAINER=	statue@freebsd.sinica.edu.tw

USE_QT_VER=	2
USE_GMAKE=	yes
HAS_CONFIGURE=	yes
WRKSRC=		${WRKDIR}/qterm-${PORTVERSION}/src

.include <bsd.port.mk>

Line 1 Link Here

(-)qterm/distinfo (-1 / +1 lines)
1	MD5 (qterm-0.1.3-1.tar.gz) = 7927d248104b65d0b07a4b5edd5ab5f8	1	MD5 (qterm-0.1.4.tar.gz) = 92a415735b932c3248df0b27c4494792




--- Makefile.orig	Wed Sep  5 14:45:55 2001
+++ Makefile	Thu Oct 25 12:11:14 2001
@@ -11,12 +11,12 @@
 CXX	=	g++
 CFLAGS	=	-pipe -Wall -W -O2 -DNO_DEBUG
 CXXFLAGS=	-pipe -Wall -W -O2 -DNO_DEBUG
-INCPATH	=	-I$(QTDIR)/include
+INCPATH	=	-I/usr/X11R6/include/qt2
 LINK	=	g++
 LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
+LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt2 -lXext -lX11 -lm
+MOC	=	/usr/X11R6/bin/moc2
+UIC	=	/usr/X11R6/bin/uic
 
 TAR	=	tar -cf
 GZIP	=	gzip -9f




--- configure.ori	Sat Mar 30 20:59:41 2002
+++ configure	Sat Mar 30 21:03:14 2002
@@ -5564,7 +5564,7 @@
   if test "x$kde_use_qt_emb" = "xyes"; then
     qtlib="qte"
   else
-    qtlib="qt"
+    qtlib="qt2"
   fi
  
   LIBQT="-l$qtlib"
@@ -6003,16 +6003,16 @@
 	IFS=$kde_save_IFS
 
         for dir in $dirs; do
-	  if test -x "$dir/moc"; then
+	  if test -x "$dir/moc2"; then
 	    if test -n ""
 	    then
-              evalstr="$dir/moc  2>&1 "
+              evalstr="$dir/moc2  2>&1 "
 	      if eval $evalstr; then
-                kde_cv_path="$dir/moc"
+                kde_cv_path="$dir/moc2"
                 break
 	      fi
             else
-		kde_cv_path="$dir/moc"
+		kde_cv_path="$dir/moc2"
                 break
 	    fi
           fi




--- qterm.cpp.orig	Thu Oct 25 22:28:43 2001
+++ qterm.cpp	Tue Feb 19 09:37:37 2002
@@ -340,8 +340,8 @@
 			}
 			else if(stat( strGlobal+"/qterm.cfg",&st)== 0)
 			{
-				strCmd="/bin/cp"+strGlobal;
-				strCmd+="qterm.cfg ";
+				strCmd="/bin/cp "+strGlobal;
+				strCmd+="/qterm.cfg ";
 				strCmd+=strMain;
 			 if( system(strCmd)<0 )
 			  {
@@ -382,7 +382,7 @@
 			else if(stat( strGlobal+"/pic",&st)== 0)
 			{
 				strCmd="/bin/cp -fr "+strGlobal;
-				strCmd+="/pic";
+				strCmd+="/pic ";
 				strCmd+=strMain;
 			 if( system(strCmd)<0 )
 			  {

Line 0 Link Here

(-)qterm/files/patch-qterm::Makefile.in (+11 lines)
	1	--- qterm/Makefile.in.ori Sat Mar 30 21:38:05 2002
	2	+++ qterm/Makefile.in Sat Mar 30 21:38:11 2002
	3	@@ -142,7 +142,7 @@
	4	LIB_KSPELL = @LIB_KSPELL@
	5	LIB_KSYCOCA = @LIB_KSYCOCA@
	6	LIB_KWRITE = @LIB_KWRITE@
	7	-LIB_QT = @LIB_QT@
	8	+LIB_QT = -lqt2 @LIB_QT@
	9	LIB_SMB = @LIB_SMB@
	10	LIB_X11 = @LIB_X11@
	11	LIB_XEXT = @LIB_XEXT@




--- qterm/qtermtelnet.h.ori	Sat Mar 30 21:15:46 2002
+++ qterm/qtermtelnet.h	Sat Mar 30 21:18:47 2002
@@ -8,8 +8,9 @@
 	#include <winsock2.h>
 #else
 	#include <netdb.h>
-	#include <sys/socket.h>
 	#include <sys/types.h>
+	#include <netinet/in.h>
+	#include <sys/socket.h>
 	#include <arpa/inet.h>
 #endif
 




bin/qterm
lib/qterm/cursor/end.xpm
lib/qterm/cursor/exit.xpm
lib/qterm/cursor/home.xpm
lib/qterm/cursor/mask.xpm
lib/qterm/cursor/next.xpm
lib/qterm/cursor/pagedown.xpm
lib/qterm/cursor/pageup.xpm
lib/qterm/cursor/prev.xpm
lib/qterm/pic/addr.bmp
lib/qterm/pic/anti.bmp
lib/qterm/pic/beep.bmp

Return to bug 37093

Lines 6-22 Link Here

(-)qterm/Makefile (-5 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= qterm	8	PORTNAME= qterm
9	PORTVERSION= 0.1.3	9	PORTVERSION= 0.1.4
10	CATEGORIES= chinese	10	CATEGORIES= chinese
11	MASTER_SITES= http://qterm.gnuchina.org/qterm-0.1.3/ \	11	MASTER_SITES= http://qterm.gnuchina.org/qterm-0.1.4/ \
12	ftp://freebsd.sinica.edu.tw/pub/statue/qterm/	12	ftp://freebsd.sinica.edu.tw/pub/statue/qterm/
13	DISTNAME= ${PORTNAME}-${PORTVERSION}-1
14		13
15	MAINTAINER= statue@freebsd.sinica.edu.tw	14	MAINTAINER= statue@freebsd.sinica.edu.tw
16		15
17	USE_QT_VER= 2	16	USE_QT_VER= 2
18	USE_GMAKE= yes	17	USE_GMAKE= yes
19		18	HAS_CONFIGURE= yes
20	WRKSRC= ${WRKDIR}/qterm-${PORTVERSION}/src
21		19
22	.include <bsd.port.mk>	20	.include <bsd.port.mk>

Lines 1-19 Link Here

(-)qterm/files/patch-Makefile (-19 lines)
1	--- Makefile.orig Wed Sep 5 14:45:55 2001
2	+++ Makefile Thu Oct 25 12:11:14 2001
3	@@ -11,12 +11,12 @@
4	CXX = g++
5	CFLAGS = -pipe -Wall -W -O2 -DNO_DEBUG
6	CXXFLAGS= -pipe -Wall -W -O2 -DNO_DEBUG
7	-INCPATH = -I$(QTDIR)/include
8	+INCPATH = -I/usr/X11R6/include/qt2
9	LINK = g++
10	LFLAGS =
11	-LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm
12	-MOC = $(QTDIR)/bin/moc
13	-UIC = $(QTDIR)/bin/uic
14	+LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt2 -lXext -lX11 -lm
15	+MOC = /usr/X11R6/bin/moc2
16	+UIC = /usr/X11R6/bin/uic
17
18	TAR = tar -cf
19	GZIP = gzip -9f

Line 0 Link Here

(-)qterm/files/patch-configure (+32 lines)
	1	--- configure.ori Sat Mar 30 20:59:41 2002
	2	+++ configure Sat Mar 30 21:03:14 2002
	3	@@ -5564,7 +5564,7 @@
	4	if test "x$kde_use_qt_emb" = "xyes"; then
	5	qtlib="qte"
	6	else
	7	- qtlib="qt"
	8	+ qtlib="qt2"
	9	fi
	10
	11	LIBQT="-l$qtlib"
	12	@@ -6003,16 +6003,16 @@
	13	IFS=$kde_save_IFS
	14
	15	for dir in $dirs; do
	16	- if test -x "$dir/moc"; then
	17	+ if test -x "$dir/moc2"; then
	18	if test -n ""
	19	then
	20	- evalstr="$dir/moc 2>&1 "
	21	+ evalstr="$dir/moc2 2>&1 "
	22	if eval $evalstr; then
	23	- kde_cv_path="$dir/moc"
	24	+ kde_cv_path="$dir/moc2"
	25	break
	26	fi
	27	else
	28	- kde_cv_path="$dir/moc"
	29	+ kde_cv_path="$dir/moc2"
	30	break
	31	fi
	32	fi

Lines 1-22 Link Here

(-)qterm/files/patch-qterm.cpp (-22 lines)
1	--- qterm.cpp.orig Thu Oct 25 22:28:43 2001
2	+++ qterm.cpp Tue Feb 19 09:37:37 2002
3	@@ -340,8 +340,8 @@
4	}
5	else if(stat( strGlobal+"/qterm.cfg",&st)== 0)
6	{
7	- strCmd="/bin/cp"+strGlobal;
8	- strCmd+="qterm.cfg ";
9	+ strCmd="/bin/cp "+strGlobal;
10	+ strCmd+="/qterm.cfg ";
11	strCmd+=strMain;
12	if( system(strCmd)<0 )
13	{
14	@@ -382,7 +382,7 @@
15	else if(stat( strGlobal+"/pic",&st)== 0)
16	{
17	strCmd="/bin/cp -fr "+strGlobal;
18	- strCmd+="/pic";
19	+ strCmd+="/pic ";
20	strCmd+=strMain;
21	if( system(strCmd)<0 )
22	{

Line 0 Link Here

(-)qterm/files/patch-qterm::qtermtelnet.h (+13 lines)
	1	--- qterm/qtermtelnet.h.ori Sat Mar 30 21:15:46 2002
	2	+++ qterm/qtermtelnet.h Sat Mar 30 21:18:47 2002
	3	@@ -8,8 +8,9 @@
	4	#include <winsock2.h>
	5	#else
	6	#include <netdb.h>
	7	- #include <sys/socket.h>
	8	#include <sys/types.h>
	9	+ #include <netinet/in.h>
	10	+ #include <sys/socket.h>
	11	#include <arpa/inet.h>
	12	#endif
	13

Lines 1-12 Link Here

(-)qterm/pkg-plist (-8 / +8 lines)
1	bin/qterm	1	bin/qterm
2	lib/qterm/cursor/downArrow.bmp	2	lib/qterm/cursor/end.xpm
3	lib/qterm/cursor/leftArrow.bmp	3	lib/qterm/cursor/exit.xpm
4	lib/qterm/cursor/m_downArrow.bmp	4	lib/qterm/cursor/home.xpm
5	lib/qterm/cursor/m_leftArrow.bmp	5	lib/qterm/cursor/mask.xpm
6	lib/qterm/cursor/m_rightArrow.bmp	6	lib/qterm/cursor/next.xpm
7	lib/qterm/cursor/m_upArrow.bmp	7	lib/qterm/cursor/pagedown.xpm
8	lib/qterm/cursor/rightArrow.bmp	8	lib/qterm/cursor/pageup.xpm
9	lib/qterm/cursor/upArrow.bmp	9	lib/qterm/cursor/prev.xpm
10	lib/qterm/pic/addr.bmp	10	lib/qterm/pic/addr.bmp
11	lib/qterm/pic/anti.bmp	11	lib/qterm/pic/anti.bmp
12	lib/qterm/pic/beep.bmp	12	lib/qterm/pic/beep.bmp