From d233c2890dace93f74b35a1a2ff35d38dfd261ac Mon Sep 17 00:00:00 2001 From: naddy Date: Wed, 23 Mar 2016 21:58:11 +0000 Subject: [PATCH] g/c PFRAG.shared --- lang/squeak/vm/Makefile | 4 ++-- lang/squeak/vm/pkg/PFRAG.shared | 2 -- lang/squeak/vm/pkg/PLIST | 22 +++++++++++----------- x11/qt3/Makefile | 4 ++-- x11/qt3/pkg/PFRAG.shared-main | 15 --------------- x11/qt3/pkg/PLIST-main | 17 +++++++++++++++-- 6 files changed, 30 insertions(+), 34 deletions(-) delete mode 100644 lang/squeak/vm/pkg/PFRAG.shared delete mode 100644 x11/qt3/pkg/PFRAG.shared-main diff --git a/lang/squeak/vm/Makefile b/lang/squeak/vm/Makefile index 6646cc0c3ae..ecc0f102db0 100644 --- a/lang/squeak/vm/Makefile +++ b/lang/squeak/vm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2015/01/22 13:11:44 naddy Exp $ +# $OpenBSD: Makefile,v 1.22 2016/03/23 21:58:11 naddy Exp $ COMMENT = smalltalk system, vm @@ -6,7 +6,7 @@ SRCV = 1 DISTFILES = Squeak-$V-${SRCV}.src.tar.gz PKGNAME = squeak-vm-$V.${SRCV} -REVISION = 4 +REVISION = 5 WRKDIST = ${WRKDIR}/Squeak-$V-${SRCV} WRKSRC = ${WRKDIST}/platforms/unix/config diff --git a/lang/squeak/vm/pkg/PFRAG.shared b/lang/squeak/vm/pkg/PFRAG.shared deleted file mode 100644 index 4d5ae4adb87..00000000000 --- a/lang/squeak/vm/pkg/PFRAG.shared +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2005/10/02 13:16:23 espie Exp $ -lib/squeak/${FULLV}/npsqueak.so diff --git a/lang/squeak/vm/pkg/PLIST b/lang/squeak/vm/pkg/PLIST index c8b938b966c..eca708a535e 100644 --- a/lang/squeak/vm/pkg/PLIST +++ b/lang/squeak/vm/pkg/PLIST @@ -1,16 +1,17 @@ -@comment $OpenBSD: PLIST,v 1.6 2008/07/23 11:17:22 espie Exp $ +@comment $OpenBSD: PLIST,v 1.7 2016/03/23 21:58:11 naddy Exp $ bin/squeak lib/squeak/${FULLV}/ -lib/squeak/${FULLV}/B3DAcceleratorPlugin -lib/squeak/${FULLV}/PseudoTTYPlugin -lib/squeak/${FULLV}/Squeak3D -lib/squeak/${FULLV}/UnixOSProcessPlugin -lib/squeak/${FULLV}/XDisplayControlPlugin +@bin lib/squeak/${FULLV}/B3DAcceleratorPlugin +@bin lib/squeak/${FULLV}/PseudoTTYPlugin +@bin lib/squeak/${FULLV}/Squeak3D +@bin lib/squeak/${FULLV}/UnixOSProcessPlugin +@bin lib/squeak/${FULLV}/XDisplayControlPlugin +lib/squeak/${FULLV}/npsqueak.so @bin lib/squeak/${FULLV}/squeak -lib/squeak/${FULLV}/vm-display-X11 -lib/squeak/${FULLV}/vm-display-null -lib/squeak/${FULLV}/vm-sound-OpenBSD -lib/squeak/${FULLV}/vm-sound-null +@bin lib/squeak/${FULLV}/vm-display-X11 +@bin lib/squeak/${FULLV}/vm-display-null +@bin lib/squeak/${FULLV}/vm-sound-OpenBSD +@bin lib/squeak/${FULLV}/vm-sound-null lib/squeak/npsqueakregister lib/squeak/npsqueakrun @man man/man1/inisqueak.1 @@ -20,4 +21,3 @@ share/doc/squeak/LICENSE.gz share/doc/squeak/README.Contributing.gz share/doc/squeak/README.Keyboard.gz share/doc/squeak/README.Sound.gz -%%SHARED%% diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile index b03f0153c6d..8f191d06a6b 100644 --- a/x11/qt3/Makefile +++ b/x11/qt3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.115 2015/08/24 10:01:10 sthen Exp $ +# $OpenBSD: Makefile,v 1.116 2016/03/23 21:58:11 naddy Exp $ # no libGL (toolchain issue) NOT_FOR_ARCHS= m88k @@ -21,7 +21,7 @@ PKGNAME-sqlite2= qt3-sqlite2-${VERSION} REVISION-mysql= 9 REVISION-postgresql= 6 -REVISION-main= 9 +REVISION-main= 10 REVISION-html= 2 REVISION-examples= 2 REVISION-sqlite2= 6 diff --git a/x11/qt3/pkg/PFRAG.shared-main b/x11/qt3/pkg/PFRAG.shared-main deleted file mode 100644 index 374ba488427..00000000000 --- a/x11/qt3/pkg/PFRAG.shared-main +++ /dev/null @@ -1,15 +0,0 @@ -@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/20 20:41:01 espie Exp $ -@lib lib/libqt-mt.so.${LIBqt-mt_VERSION} -@lib lib/libqui-mt.so.${LIBqui-mt_VERSION} -@lib lib/libqui.so.${LIBqui_VERSION} -@lib lib/qt3/libqt-mt.so.${LIBqt-mt_VERSION} -@lib lib/qt3/libqui-mt.so.${LIBqui-mt_VERSION} -@lib lib/qt3/libqui.so.${LIBqui_VERSION} -lib/qt3/${QT_PLUGINS}/designer/libcppeditor.so -lib/qt3/${QT_PLUGINS}/designer/libdlgplugin.so -lib/qt3/${QT_PLUGINS}/designer/librcplugin.so -lib/qt3/${QT_PLUGINS}/designer/libwizards.so -lib/qt3/${QT_PLUGINS}/inputmethods/libqimsw-multi.so -lib/qt3/${QT_PLUGINS}/inputmethods/libqimsw-none.so -lib/qt3/${QT_PLUGINS}/inputmethods/libqsimple.so -lib/qt3/${QT_PLUGINS}/inputmethods/libqxim.so diff --git a/x11/qt3/pkg/PLIST-main b/x11/qt3/pkg/PLIST-main index e7e184958b2..98dc17799cd 100644 --- a/x11/qt3/pkg/PLIST-main +++ b/x11/qt3/pkg/PLIST-main @@ -1,9 +1,8 @@ -@comment $OpenBSD: PLIST-main,v 1.8 2015/05/22 11:31:20 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.9 2016/03/23 21:58:11 naddy Exp $ @conflict qt3-* @conflict qt3-base-* @pkgpath x11/qt3,mt @pkgpath x11/qt3 -%%SHARED%% bin/assistant bin/assistant-mt bin/designer3 @@ -435,6 +434,9 @@ include/X11/qt3/qwizard.h include/X11/qt3/qwmatrix.h include/X11/qt3/qworkspace.h include/X11/qt3/qxml.h +@lib lib/libqt-mt.so.${LIBqt-mt_VERSION} +@lib lib/libqui-mt.so.${LIBqui-mt_VERSION} +@lib lib/libqui.so.${LIBqui_VERSION} lib/pkgconfig/qt-mt.pc lib/qt3/ lib/qt3/.qmake.cache @@ -458,6 +460,9 @@ lib/qt3/lib lib/qt3/libdesignercore.a lib/qt3/libeditor.a lib/qt3/libqassistantclient.a +@lib lib/qt3/libqt-mt.so.${LIBqt-mt_VERSION} +@lib lib/qt3/libqui-mt.so.${LIBqui-mt_VERSION} +@lib lib/qt3/libqui.so.${LIBqui_VERSION} @mandir lib/qt3/man/ lib/qt3/man/man1/ @man lib/qt3/man/man1/lrelease.1 @@ -1493,7 +1498,15 @@ lib/qt3/mkspecs/win32-watcom/ lib/qt3/mkspecs/win32-watcom/qmake.conf lib/qt3/${QT_PLUGINS}/ lib/qt3/${QT_PLUGINS}/designer/ +lib/qt3/${QT_PLUGINS}/designer/libcppeditor.so +lib/qt3/${QT_PLUGINS}/designer/libdlgplugin.so +lib/qt3/${QT_PLUGINS}/designer/librcplugin.so +lib/qt3/${QT_PLUGINS}/designer/libwizards.so lib/qt3/${QT_PLUGINS}/inputmethods/ +lib/qt3/${QT_PLUGINS}/inputmethods/libqimsw-multi.so +lib/qt3/${QT_PLUGINS}/inputmethods/libqimsw-none.so +lib/qt3/${QT_PLUGINS}/inputmethods/libqsimple.so +lib/qt3/${QT_PLUGINS}/inputmethods/libqxim.so lib/qt3/${QT_PLUGINS}/sqldrivers/ lib/qt3/${QT_PLUGINS}/styles/ share/doc/qt3/