Date: Sun, 30 Dec 2001 03:56:25 -0800 (PST) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/33336: Update port: devel/qtez Message-ID: <200112301156.fBUBuPa58767@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 33336
>Category: ports
>Synopsis: Update port: devel/qtez
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 30 04:00:03 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Remove dependency for automake/autoconf
Remove file:
files/patch-ad
files/patch-ag
files/patch-ah
files/patch-ai
files/patch-aj
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/devel/qtez/Makefile devel/qtez/Makefile
--- /usr/ports/devel/qtez/Makefile Tue Oct 30 18:55:05 2001
+++ devel/qtez/Makefile Sat Dec 29 10:58:56 2001
@@ -17,11 +17,9 @@
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_QT_VER= 2
-USE_AUTOMAKE= yes
-AUTOMAKE_ARGS= -a -i && ${PERL} automoc
USE_LIBTOOL= yes
-CONFIGURE_ENV= QTDIR="${X11BASE}" QTEZ="${PREFIX}/share/qtez"
-MAKE_ENV= QTEZ="${PREFIX}/share/qtez"
+CONFIGURE_ENV= QTDIR="${X11BASE}" QTEZ="${DATADIR}" MSG2QM="${MOC}"
+MAKE_ENV= QTEZ="${DATADIR}"
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
@@ -30,7 +28,18 @@
CFLAGS+= -O0
.endif
+post-patch:
+ @${PERL} -pi -e 's|-O2 |\$$CXXFLAGS |g ; \
+ s|include/qaction.h|include/${QTNAME}/qaction.h|g ; \
+ s|qtdir/include$$|qtdir/include/${QTNAME}|g ; \
+ s|-lqt|-l${QTNAME}|g' ${WRKSRC}/configure
+ @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+ 's|doc po images|doc images|g ; \
+ s|prefix\)/qtez/plugins|prefix\)/lib/qtez/plugins|g ; \
+ s|prefix\)/qtez/img|QTEZ\)/img|g'
+
pre-configure:
+ @cd ${WRKSRC} && ${PERL} automoc
@cd ${WRKSRC}/src && ${SH} ./autolinks.sh
post-install:
diff -urN /usr/ports/devel/qtez/files/patch-ad devel/qtez/files/patch-ad
--- /usr/ports/devel/qtez/files/patch-ad Mon Mar 26 17:27:31 2001
+++ devel/qtez/files/patch-ad Thu Jan 1 09:00:00 1970
@@ -1,49 +0,0 @@
---- configure.in.orig Wed Nov 22 16:55:07 2000
-+++ configure.in Fri Feb 2 22:45:34 2001
-@@ -48,15 +48,15 @@
- if test "$enableval" = "yes"; then \
- DEBUG="-g -DDEBUG -W -Wall"; \
- else
-- DEBUG="-O2 -DNO_DEBUG -DNO_CHECK"; \
-+ DEBUG="$CXXFLAGS -DNO_DEBUG -DNO_CHECK"; \
- fi,
- enableval=no
--DEBUG="-O2 -DNO_DEBUG -DNO_CHECK")
-+DEBUG="$CXXFLAGS -DNO_DEBUG -DNO_CHECK")
- AC_MSG_RESULT($enableval)
- AC_SUBST(DEBUG)
-
- AC_MSG_CHECKING(for Qt >= 2.2.0)
--if ! test -r $QTDIR/include/qaction.h; then
-+if ! test -r $QTDIR/include/qt2/qaction.h; then
- AC_MSG_ERROR([ Sorry, but you need Qt version 2.2.0 or higher to compile $PACKAGE])
- else
- AC_MSG_RESULT(yes)
-@@ -64,12 +64,12 @@
-
- AC_PATH_X
- qtdir=${QTDIR}
--qt_includes=$qtdir/include
-+qt_includes=$qtdir/include/qt2
- qt_libraries=$qtdir/lib
- qt_moc=$qtdir/bin
- QT_LDFLAGS=-L$qt_libraries
- LDFLAGS="$LDFLAGS -L$qt_libraries"
--AC_CHECK_LIB(qt, main,,AC_MSG_ERROR(Cannot find required library Qt.))
-+AC_CHECK_LIB(qt2, main,,AC_MSG_ERROR(Cannot find required library Qt.))
- AC_SUBST(qt_includes)
- AC_SUBST(qt_libraries)
- AC_SUBST(QT_LDFLAGS)
-@@ -78,12 +78,6 @@
- dnl !!!!! fix it !!!!!
- all_includes=-I$qt_includes
- AC_SUBST(all_includes)
--
--dnl @iko : inject msg2qm real path, as if it may be installed in other catalog ^)
--AC_PATH_PROG(MSG2QM,msg2qm,,$bindir:$QTDIR/bin)
--if test "$MSG2QM" = ""; then
-- AC_MSG_ERROR([ Sorry, but you need msg2qm (Qt2 program) to compile $PACKAGE])
--fi
-
- dnl *** check QTEZ environment variable ***
- AC_MSG_CHECKING(for QTEZ variable)
diff -urN /usr/ports/devel/qtez/files/patch-ag devel/qtez/files/patch-ag
--- /usr/ports/devel/qtez/files/patch-ag Mon Mar 26 17:27:31 2001
+++ devel/qtez/files/patch-ag Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- src/plugins/bugreport/Makefile.am.orig Fri Sep 15 03:08:52 2000
-+++ src/plugins/bugreport/Makefile.am Fri Sep 15 10:01:20 2000
-@@ -12,7 +12,7 @@
- PluginBugReport.h PluginBugReport.cpp
-
- libbugreport_la_METASOURCES = USE_AUTOMOC
--libdir = $(prefix)/qtez/plugins
-+libdir = $(prefix)/lib/qtez/plugins
-
- #noinst_PROGRAMS = bug
- #bug_SOURCES = main.cpp
diff -urN /usr/ports/devel/qtez/files/patch-ah devel/qtez/files/patch-ah
--- /usr/ports/devel/qtez/files/patch-ah Sun Sep 17 02:52:59 2000
+++ devel/qtez/files/patch-ah Thu Jan 1 09:00:00 1970
@@ -1,8 +0,0 @@
---- src/plugins/bugreport/pix/Makefile.am.orig Fri Mar 31 16:36:47 2000
-+++ src/plugins/bugreport/pix/Makefile.am Fri Sep 15 10:08:30 2000
-@@ -2,4 +2,4 @@
-
- EXTRA_DIST = bwiz.png tm.png bugreport.xpm
- images_DATA = bwiz.png tm.png
--imagesdir = $(prefix)/qtez/img
-+imagesdir = $(QTEZ)/img
diff -urN /usr/ports/devel/qtez/files/patch-ai devel/qtez/files/patch-ai
--- /usr/ports/devel/qtez/files/patch-ai Sat Oct 14 05:19:52 2000
+++ devel/qtez/files/patch-ai Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.am.orig Tue Sep 26 00:44:36 2000
-+++ Makefile.am Tue Sep 26 01:03:33 2000
-@@ -3,7 +3,7 @@
- EXTRA_DIST = qtez.lsm BUGS TODO changes.html \
- TODO.sk BUGS.sk qtez.spec autogen.sh automoc
-
--SUBDIRS = src KDE templates doc po images
-+SUBDIRS = src KDE templates doc images
-
- install-data-local:
- @echo ""
diff -urN /usr/ports/devel/qtez/files/patch-aj devel/qtez/files/patch-aj
--- /usr/ports/devel/qtez/files/patch-aj Mon Mar 26 17:27:32 2001
+++ devel/qtez/files/patch-aj Thu Jan 1 09:00:00 1970
@@ -1,8 +0,0 @@
---- src/plugins/srceditor/Makefile.am.orig Thu Dec 7 20:45:50 2000
-+++ src/plugins/srceditor/Makefile.am Sat Feb 3 04:16:19 2001
-@@ -11,4 +11,4 @@
- MainEditor.h MainEditor.cpp
-
- libSyntaxEditor_la_METASOURCES = USE_AUTOMOC
--libdir = $(prefix)/qtez/plugins/sourceditor
-+libdir = $(prefix)/lib/qtez/plugins/sourceditor
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112301156.fBUBuPa58767>