diff options
author | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-01-27 17:56:53 +0000 |
---|---|---|
committer | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-01-27 17:56:53 +0000 |
commit | bd71a8310f23517d9ec39c001dee4f8bc6ba13e1 (patch) | |
tree | 4736342b7054b058142a28ce6ab970acb269fad5 /devel | |
parent | Update to 1.13 (diff) |
Remove automake/conf dependency
PR: 33336
Submitted by: tkato@prontomail.com
Diffstat (limited to 'devel')
-rw-r--r-- | devel/qtez/Makefile | 17 | ||||
-rw-r--r-- | devel/qtez/files/patch-ad | 49 | ||||
-rw-r--r-- | devel/qtez/files/patch-ag | 11 | ||||
-rw-r--r-- | devel/qtez/files/patch-ah | 8 | ||||
-rw-r--r-- | devel/qtez/files/patch-ai | 11 | ||||
-rw-r--r-- | devel/qtez/files/patch-aj | 8 |
6 files changed, 13 insertions, 91 deletions
diff --git a/devel/qtez/Makefile b/devel/qtez/Makefile index c46f83738579..80c2615bf43f 100644 --- a/devel/qtez/Makefile +++ b/devel/qtez/Makefile @@ -17,11 +17,9 @@ MAINTAINER= ports@FreeBSD.org 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 @@ INSTALLS_SHLIB= yes 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 --git a/devel/qtez/files/patch-ad b/devel/qtez/files/patch-ad deleted file mode 100644 index 4b19f0058f57..000000000000 --- a/devel/qtez/files/patch-ad +++ /dev/null @@ -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 --git a/devel/qtez/files/patch-ag b/devel/qtez/files/patch-ag deleted file mode 100644 index 61fb46af6bd6..000000000000 --- a/devel/qtez/files/patch-ag +++ /dev/null @@ -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 --git a/devel/qtez/files/patch-ah b/devel/qtez/files/patch-ah deleted file mode 100644 index f9540000348a..000000000000 --- a/devel/qtez/files/patch-ah +++ /dev/null @@ -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 --git a/devel/qtez/files/patch-ai b/devel/qtez/files/patch-ai deleted file mode 100644 index ab20f06b7201..000000000000 --- a/devel/qtez/files/patch-ai +++ /dev/null @@ -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 --git a/devel/qtez/files/patch-aj b/devel/qtez/files/patch-aj deleted file mode 100644 index 174afe657fde..000000000000 --- a/devel/qtez/files/patch-aj +++ /dev/null @@ -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 |