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

- SHARED_LIBS

Browse Source 
- remove shared library .so and .so.N links
This commit is contained in:
naddy 2005-12-31 15:18:44 +00:00
parent 9a0906c882
commit 72c66765d8
16 changed files with 68 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x11/wxWidgets/base/Makefile
View File

@ -1,11 +1,14 @@
# $OpenBSD: Makefile,v 1.2 2004/12/18 21:12:42 alek Exp $ # $OpenBSD: Makefile,v 1.3 2005/12/31 15:18:44 naddy Exp $
COMMENT= "C++ cross-platform GUI toolkit - base (no GUI) version" COMMENT= "C++ cross-platform GUI toolkit - base (no GUI) version"
PKGNAME= wxWidgets-base-${VERSION} PKGNAME= wxWidgets-base-${VERSION}p0
SHARED_LIBS= wx_base 2.4
NO_REGRESS= Yes NO_REGRESS= Yes
CONFIGURE_ARGS+= --disable-gui CONFIGURE_ARGS+= --disable-gui
CONFIGURE_ENV+= WX_CURRENT=${LIBwx_base_VERSION:R} \
WX_REVISION=${LIBwx_base_VERSION:E}
RUN_DEPENDS+= ::x11/wxWidgets/headers RUN_DEPENDS+= ::x11/wxWidgets/headers
WANTLIB= m z WANTLIB= m z

5
x11/wxWidgets/base/pkg/PFRAG.shared
View File

@ -1,3 +1,2 @@
lib/libwx_base.so @comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/31 15:18:44 naddy Exp $
lib/libwx_base.so.2 @lib lib/libwx_base.so.${LIBwx_base_VERSION}
@lib lib/libwx_base.so.2.4

7
x11/wxWidgets/gtk/Makefile
View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.5 2005/12/06 19:16:03 alek Exp $ # $OpenBSD: Makefile,v 1.6 2005/12/31 15:18:44 naddy Exp $
COMMENT= "C++ cross-platform GUI toolkit - GTK version" COMMENT= "C++ cross-platform GUI toolkit - GTK version"
PKGNAME= wxWidgets-gtk-${VERSION}p2 PKGNAME= wxWidgets-gtk-${VERSION}p3
SHARED_LIBS= wx_gtk 2.4
CONFIGURE_ARGS+= --with-gtk CONFIGURE_ARGS+= --with-gtk
CONFIGURE_ENV+= WX_CURRENT=${LIBwx_gtk_VERSION:R} \
WX_REVISION=${LIBwx_gtk_VERSION:E}
LIB_DEPENDS+= gtk.1.2::x11/gtk+ LIB_DEPENDS+= gtk.1.2::x11/gtk+
RUN_DEPENDS+= ::x11/wxWidgets/headers RUN_DEPENDS+= ::x11/wxWidgets/headers
RUN_DEPENDS+= ::x11/wxWidgets/gtkheaders RUN_DEPENDS+= ::x11/wxWidgets/gtkheaders

6
x11/wxWidgets/gtk/pkg/PFRAG.shared
View File

@ -1,4 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/02/13 10:56:23 sturm Exp $ @comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/31 15:18:44 naddy Exp $
lib/libwx_gtk.so @lib lib/libwx_gtk.so.${LIBwx_gtk_VERSION}
lib/libwx_gtk.so.2
@lib lib/libwx_gtk.so.2.4

5
x11/wxWidgets/gtk/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2005/11/10 12:18:25 espie Exp $ @comment $OpenBSD: PLIST,v 1.5 2005/12/31 15:18:44 naddy Exp $
%%SHARED%% %%SHARED%%
!%%SHARED%% !%%SHARED%%
@comment bin/wx-config @comment bin/wx-config
@ -136,7 +136,6 @@ bin/wxgtk-2.4-config
@comment include/wx/glcanvas.h @comment include/wx/glcanvas.h
@comment include/wx/grid.h @comment include/wx/grid.h
@comment include/wx/gsocket.h @comment include/wx/gsocket.h
@comment include/wx/gtk/
@comment include/wx/gtk/accel.h @comment include/wx/gtk/accel.h
@comment include/wx/gtk/app.h @comment include/wx/gtk/app.h
@comment include/wx/gtk/bitmap.h @comment include/wx/gtk/bitmap.h
@ -373,9 +372,7 @@ lib/wx/include/gtk-2.4/
lib/wx/include/gtk-2.4/wx/ lib/wx/include/gtk-2.4/wx/
lib/wx/include/gtk-2.4/wx/setup.h lib/wx/include/gtk-2.4/wx/setup.h
lib/wx/include/univ/ lib/wx/include/univ/
@comment share/aclocal/
@comment share/aclocal/wxwin.m4 @comment share/aclocal/wxwin.m4
@comment share/locale/
@comment share/wx/2.4/afm/Cour.afm @comment share/wx/2.4/afm/Cour.afm
@comment share/wx/2.4/afm/CourBo.afm @comment share/wx/2.4/afm/CourBo.afm
@comment share/wx/2.4/afm/CourBoO.afm @comment share/wx/2.4/afm/CourBoO.afm

8
x11/wxWidgets/gtk2/Makefile
View File

@ -1,8 +1,12 @@
# $OpenBSD: Makefile,v 1.6 2005/12/06 19:16:03 alek Exp $ # $OpenBSD: Makefile,v 1.7 2005/12/31 15:18:44 naddy Exp $
COMMENT= "C++ cross-platform GUI toolkit - GTK2 version" COMMENT= "C++ cross-platform GUI toolkit - GTK2 version"
PKGNAME= wxWidgets-gtk2-${VERSION}p1 PKGNAME= wxWidgets-gtk2-${VERSION}p2
SHARED_LIBS= wx_gtk2 2.4
CONFIGURE_ARGS= --enable-gtk2 CONFIGURE_ARGS= --enable-gtk2
CONFIGURE_ENV+= WX_CURRENT=${LIBwx_gtk2_VERSION:R} \
WX_REVISION=${LIBwx_gtk2_VERSION:E}
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= ::x11/gtk+2 \ LIB_DEPENDS= ::x11/gtk+2 \

6
x11/wxWidgets/gtk2/pkg/PFRAG.shared
View File

@ -1,4 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 20:00:07 espie Exp $ @comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/31 15:18:44 naddy Exp $
lib/libwx_gtk2.so @lib lib/libwx_gtk2.so.${LIBwx_gtk2_VERSION}
lib/libwx_gtk2.so.2
@lib lib/libwx_gtk2.so.2.4

3
x11/wxWidgets/gtk2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2005/11/10 12:18:25 espie Exp $ @comment $OpenBSD: PLIST,v 1.5 2005/12/31 15:18:44 naddy Exp $
@conflict wxWidgets-gtk-<=2.4.2p0 @conflict wxWidgets-gtk-<=2.4.2p0
%%SHARED%% %%SHARED%%
!%%SHARED%% !%%SHARED%%
@ -137,7 +137,6 @@ bin/wxgtk2-2.4-config
@comment include/wx/glcanvas.h @comment include/wx/glcanvas.h
@comment include/wx/grid.h @comment include/wx/grid.h
@comment include/wx/gsocket.h @comment include/wx/gsocket.h
@comment include/wx/gtk/
@comment include/wx/gtk/accel.h @comment include/wx/gtk/accel.h
@comment include/wx/gtk/app.h @comment include/wx/gtk/app.h
@comment include/wx/gtk/bitmap.h @comment include/wx/gtk/bitmap.h

7
x11/wxWidgets/lesstif/Makefile
View File

@ -1,10 +1,13 @@
# $OpenBSD: Makefile,v 1.2 2005/02/13 10:56:23 sturm Exp $ # $OpenBSD: Makefile,v 1.3 2005/12/31 15:18:44 naddy Exp $
COMMENT= "C++ cross-platform GUI toolkit - lesstif version" COMMENT= "C++ cross-platform GUI toolkit - lesstif version"
# Note the package name must conflict with motif until these can be installed side-by-side # Note the package name must conflict with motif until these can be installed side-by-side
PKGNAME= wxWidgets-motif-${VERSION}p0-lesstif PKGNAME= wxWidgets-motif-${VERSION}p1-lesstif
SHARED_LIBS= wx_motif 2.4
CONFIGURE_ARGS+= --with-motif CONFIGURE_ARGS+= --with-motif
CONFIGURE_ENV+= WX_CURRENT=${LIBwx_motif_VERSION:R} \
WX_REVISION=${LIBwx_motif_VERSION:E}
RUN_DEPENDS+= ::x11/wxWidgets/headers RUN_DEPENDS+= ::x11/wxWidgets/headers
# 'USE_MOTIF=any' breaks package names if lesstif is already in FLAVORS or PSEUDO_FLAVORS # 'USE_MOTIF=any' breaks package names if lesstif is already in FLAVORS or PSEUDO_FLAVORS

6
x11/wxWidgets/lesstif/pkg/PFRAG.shared
View File

@ -1,4 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/02/13 10:56:24 sturm Exp $ @comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/31 15:18:44 naddy Exp $
lib/libwx_motif.so @lib lib/libwx_motif.so.${LIBwx_motif_VERSION}
lib/libwx_motif.so.2
@lib lib/libwx_motif.so.2.4

7
x11/wxWidgets/motif/Makefile
View File

@ -1,10 +1,13 @@
# $OpenBSD: Makefile,v 1.4 2005/12/06 19:16:03 alek Exp $ # $OpenBSD: Makefile,v 1.5 2005/12/31 15:18:44 naddy Exp $
COMMENT= "C++ cross-platform GUI toolkit - motif version" COMMENT= "C++ cross-platform GUI toolkit - motif version"
PKGNAME= wxWidgets-motif-${VERSION}p1 PKGNAME= wxWidgets-motif-${VERSION}p2
SHARED_LIBS= wx_motif 2.4
USE_MOTIF= openmotif USE_MOTIF= openmotif
CONFIGURE_ARGS+= --with-motif CONFIGURE_ARGS+= --with-motif
CONFIGURE_ENV+= WX_CURRENT=${LIBwx_motif_VERSION:R} \
WX_REVISION=${LIBwx_motif_VERSION:E}
RUN_DEPENDS+= ::x11/wxWidgets/headers RUN_DEPENDS+= ::x11/wxWidgets/headers
WANTLIB= ICE SM X11 Xext Xmu Xpm Xt m z WANTLIB= ICE SM X11 Xext Xmu Xpm Xt m z

6
x11/wxWidgets/motif/pkg/PFRAG.shared
View File

@ -1,4 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/02/13 10:56:24 sturm Exp $ @comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/31 15:18:44 naddy Exp $
lib/libwx_motif.so @lib lib/libwx_motif.so.${LIBwx_motif_VERSION}
lib/libwx_motif.so.2
@lib lib/libwx_motif.so.2.4

8
x11/wxWidgets/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $ $OpenBSD: patch-Makefile_in,v 1.2 2005/12/31 15:18:44 naddy Exp $
--- Makefile.in.orig Sun Dec 22 21:58:54 2002 --- Makefile.in.orig Sat Sep 20 12:23:04 2003
+++ Makefile.in Tue Feb 25 16:00:59 2003 +++ Makefile.in Sat Dec 31 00:06:57 2005
@@ -383,7 +383,7 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl @@ -383,7 +383,7 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \ && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@
@ -57,7 +57,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
-install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@ -install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@
+install_common: install_headers install_locale @AFMINSTALL@ m4datainstall +install_common: install_headers install_locale @AFMINSTALL@ m4datainstall
+ +
+install: preinstall install_headers install_locale @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@ +install: preinstall install_headers install_locale @AFMINSTALL@ m4datainstall @WIN32INSTALL@
@echo " " @echo " "
@echo " The installation of wxWindows is finished. On certain" @echo " The installation of wxWindows is finished. On certain"
@echo " platforms (e.g. Linux) you'll now have to run ldconfig" @echo " platforms (e.g. Linux) you'll now have to run ldconfig"

25
x11/wxWidgets/patches/patch-configure
View File

@ -1,6 +1,17 @@
$OpenBSD: patch-configure,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $ $OpenBSD: patch-configure,v 1.2 2005/12/31 15:18:44 naddy Exp $
--- configure.orig Sun Sep 21 21:10:06 2003 --- configure.orig Sun Sep 21 13:10:06 2003
+++ configure Mon Jun 28 19:09:59 2004 +++ configure Fri Dec 30 23:43:16 2005
@@ -1093,8 +1093,8 @@ WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_
WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
-WX_CURRENT=0
-WX_REVISION=1
+#WX_CURRENT=0
+#WX_REVISION=1
WX_AGE=1
@@ -16042,9 +16042,6 @@ if test "$wxUSE_UNICODE" = "yes"; then @@ -16042,9 +16042,6 @@ if test "$wxUSE_UNICODE" = "yes"; then
fi fi
@ -17,16 +28,16 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" -WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" -WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}" +WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}"
+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}" +WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}"
-WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" -WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}"
-WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}" -WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" -WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" -WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+WX_LIBRARY_LINK1="lib${WX_LIBRARY%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_MAJOR_VERSION_NUMBER}" +WX_LIBRARY_LINK1="lib${WX_LIBRARY%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_CURRENT}"
+WX_LIBRARY_LINK2="lib${WX_LIBRARY%-${WX_RELEASE}}.${SO_SUFFIX}" +WX_LIBRARY_LINK2="lib${WX_LIBRARY%-${WX_RELEASE}}.${SO_SUFFIX}"
+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_MAJOR_VERSION_NUMBER}" +WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_CURRENT}"
+WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL%-${WX_RELEASE}}.${SO_SUFFIX}" +WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL%-${WX_RELEASE}}.${SO_SUFFIX}"
case "${host}" in case "${host}" in

7
x11/wxWidgets/x11univ/Makefile
View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.4 2005/12/06 19:16:03 alek Exp $ # $OpenBSD: Makefile,v 1.5 2005/12/31 15:18:44 naddy Exp $
COMMENT= "C++ cross-platform GUI toolkit - x11univ version" COMMENT= "C++ cross-platform GUI toolkit - x11univ version"
PKGNAME= wxWidgets-x11univ-${VERSION}p1 PKGNAME= wxWidgets-x11univ-${VERSION}p2
SHARED_LIBS= wx_x11univ 2.4
CONFIGURE_ARGS+= --with-x11 CONFIGURE_ARGS+= --with-x11
CONFIGURE_ENV+= WX_CURRENT=${LIBwx_x11univ_VERSION:R} \
WX_REVISION=${LIBwx_x11univ_VERSION:E}
RUN_DEPENDS+= ::x11/wxWidgets/headers RUN_DEPENDS+= ::x11/wxWidgets/headers
WANTLIB= X11 Xpm m z WANTLIB= X11 Xpm m z

6
x11/wxWidgets/x11univ/pkg/PFRAG.shared
View File

@ -1,4 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/02/13 10:56:24 sturm Exp $ @comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/31 15:18:44 naddy Exp $
lib/libwx_x11univ.so @lib lib/libwx_x11univ.so.${LIBwx_x11univ_VERSION}
lib/libwx_x11univ.so.2
@lib lib/libwx_x11univ.so.2.4