cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix pkgnames, bump stuff.

Browse Source 
add a qt-mt.pc that looks like something.
fix a buglet in qmake.
This commit is contained in:
espie 2007-02-17 18:59:04 +00:00
parent 0e82fb7814
commit 56022fec1b
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/qt3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.72 2007/01/29 09:24:13 espie Exp $
# $OpenBSD: Makefile,v 1.73 2007/02/17 18:59:04 espie Exp $
# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
COMMENT-main= "C++ X11 GUI toolkit"
@ -12,9 +12,9 @@ PKGNAME= qt3-${VERSION}
PKGNAME-mysql= qt3-mysql-${VERSION}
PKGNAME-postgresql= qt3-postgresql-${VERSION}
PKGNAME-examples= qt3-examples-${VERSION}
FULLPKGNAME-main= qt3-mt-${VERSION}${PKGDEBUG}p0
PKGNAME-main= qt3-mt-${VERSION}p1
FULLPKGNAME-html= qt3-html-${VERSION}
FULLPKGNAME-sqlite2= qt3-sqlite2-${VERSION}
PKGNAME-sqlite2= qt3-sqlite2-${VERSION}
SHARED_LIBS= qt-mt 30.3 \
qui 2.0 \
qui-mt 2.0
@ -191,8 +191,9 @@ NO_REGRESS= Yes
PROGRAMS3=designer findtr moc qt20fix qtrename140 uic
PROGRAMS=assistant linguist lrelease lupdate qm2ts qmake qtconfig
.if !${FLAVOR:L:Mdebug}
post-configure:
perl -pi.bak -e 's,-L(\Q${WRKDIST}\E|\Q$$(LOCALBASE)\E)/lib,,' ${WRKDIST}/lib/qt-mt.pc
.if !${FLAVOR:L:Mdebug}
@cd ${WRKSRC} && cp -R examples examples-src
@find ${WRKSRC}/examples-src -name '*.orig' |xargs rm -f
@find ${WRKSRC}/examples-src -name '.moc' |xargs rm -rf
@ -229,6 +230,8 @@ post-patch:
.endif
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
${INSTALL_DATA} ${WRKDIST}/lib/qt-mt.pc ${PREFIX}/lib/pkgconfig
${INSTALL_DATA_DIR} ${QT_INCDIR}
${INSTALL_MAN_DIR} ${QT_MANDIR}/man1
${INSTALL_MAN_DIR} ${QT_MANDIR}/man3

14
x11/qt3/patches/patch-qmake_generators_unix_unixmake2_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.15 2006/03/07 19:29:20 espie Exp $
--- qmake/generators/unix/unixmake2.cpp.orig Fri Sep 2 14:43:19 2005
+++ qmake/generators/unix/unixmake2.cpp Tue Mar 7 10:42:35 2006
$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.16 2007/02/17 18:59:04 espie Exp $
--- qmake/generators/unix/unixmake2.cpp.orig Thu Oct 19 16:25:42 2006
+++ qmake/generators/unix/unixmake2.cpp Sat Feb 17 17:15:33 2007
@@ -129,6 +129,8 @@ UnixMakefileGenerator::writeMakeParts(QT
src_incremental=FALSE, moc_incremental=FALSE;
@ -67,3 +67,11 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.15 2006/03/07 19:29:20 e
}
if(project->isEmpty("QMAKE_LN_SHLIB"))
project->variables()["QMAKE_LN_SHLIB"].append("ln -s");
@@ -1586,5 +1606,6 @@ UnixMakefileGenerator::writePkgConfigFil
<< varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
<< project->variables()["PRL_EXPORT_CXXFLAGS"].join(" ")
// << varGlue("DEFINES","-D"," -D"," ")
- << " -I${includedir}";
+ << " -I${includedir}"
+ << endl;
}

6
x11/qt3/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.3 2007/01/29 09:24:13 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2007/02/17 18:59:04 espie Exp $
@conflict qt3-*
@conflict qt3-base-*
@pkgpath x11/qt3,mt
@ -435,6 +435,8 @@ include/X11/qt3/qwizard.h
include/X11/qt3/qwmatrix.h
include/X11/qt3/qworkspace.h
include/X11/qt3/qxml.h
lib/pkgconfig/
lib/pkgconfig/qt-mt.pc
lib/qt3/
lib/qt3/.qmake.cache
lib/qt3/bin/
@ -462,8 +464,8 @@ lib/qt3/man/man1/
@man lib/qt3/man/man1/lrelease.1
@man lib/qt3/man/man1/lupdate.1
@man lib/qt3/man/man1/moc3.1
@man lib/qt3/man/man1/uic3.1
@man lib/qt3/man/man1/qm2ts.1
@man lib/qt3/man/man1/uic3.1
lib/qt3/man/man3/
@man lib/qt3/man/man3/QAccel.3
@man lib/qt3/man/man3/QAccessible.3