SHARED_LIBS.

While here, build some modules directly as modules instead of
building them as libraries and later renaming them.
This commit is contained in:
naddy 2005-12-27 21:06:09 +00:00
parent 135879e05a
commit 3f2cf6b2aa
13 changed files with 128 additions and 56 deletions

View File

@ -1,9 +1,19 @@
# $OpenBSD: Makefile,v 1.4 2005/11/16 09:52:34 wilfried Exp $ # $OpenBSD: Makefile,v 1.5 2005/12/27 21:06:09 naddy Exp $
COMMENT= "settings management library used by most xfce4 modules" COMMENT= "settings management library used by most xfce4 modules"
DISTNAME= libxfce4mcs-${V} DISTNAME= libxfce4mcs-${V}
PKGNAME= ${DISTNAME}p0 PKGNAME= ${DISTNAME}p0
V= 4.2.3 V= 4.2.3
SHARED_LIBS= xfce4mcs-client 2.5 \
xfce4mcs-manager 2.5
MODGNU_SHARED_LIBS= \
xfce4mcs-client \
'-export-dynamic -export-symbols-regex "^[^_].*" -L${X11BASE}/lib' \
xfce4mcs-manager \
'-export-dynamic -export-symbols-regex "^[^_].*" -L${X11BASE}/lib'
LIBxfce4mcs-client_ALIAS= xfce4mcs_client
LIBxfce4mcs-manager_ALIAS= xfce4mcs_manager
MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/ MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/
HOMEPAGE= http://www.xfce.org/ HOMEPAGE= http://www.xfce.org/

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/11/10 22:57:38 jolan Exp $ @comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/27 21:06:09 naddy Exp $
@lib lib/libxfce4mcs-client.so.2.5 @lib lib/libxfce4mcs-client.so.${LIBxfce4mcs-client_VERSION}
@lib lib/libxfce4mcs-manager.so.2.5 @lib lib/libxfce4mcs-manager.so.${LIBxfce4mcs-manager_VERSION}

View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.4 2005/11/16 09:49:41 wilfried Exp $ # $OpenBSD: Makefile,v 1.5 2005/12/27 21:06:09 naddy Exp $
COMMENT= "widget library for xfce4" COMMENT= "widget library for xfce4"
V= 4.2.3 V= 4.2.3
DISTNAME= libxfcegui4-${V} DISTNAME= libxfcegui4-${V}
PKGNAME= ${DISTNAME}p0 PKGNAME= ${DISTNAME}p1
SHARED_LIBS= xfcegui4 3.6
MODGNU_SHARED_LIBS= xfcegui4 \
'-export-dynamic -export-symbols-regex "^[^_].*" -L${X11BASE}/lib'
MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/ MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/
HOMEPAGE= http://www.xfce.org/ HOMEPAGE= http://www.xfce.org/
@ -29,16 +32,4 @@ WANTLIB= ICE SM X11 Xext Xrender fontconfig \
CONFIGURE_ARGS+=--disable-gtk-doc CONFIGURE_ARGS+=--disable-gtk-doc
# XXX workaround libtool's versioning of simple shared object modules
post-install:
${INSTALL_DATA} \
${WRKSRC}/xfce4-modules/combo/.libs/libxfce4_combo.so.0.0 \
${PREFIX}/lib/xfce4/modules/libxfce4_combo.so
${INSTALL_DATA} \
${WRKSRC}/xfce4-modules/mime-applications/.libs/libxfce4_mime.so.0.0 \
${PREFIX}/lib/xfce4/modules/libxfce4_mime.so
${INSTALL_DATA} \
${WRKSRC}/xfce4-modules/mime-icons/.libs/libxfce4_mime_icons.so.0.0 \
${PREFIX}/lib/xfce4/modules/libxfce4_mime_icons.so
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-xfce4-modules_combo_Makefile_in,v 1.1 2005/12/27 21:06:09 naddy Exp $
--- xfce4-modules/combo/Makefile.in.orig Tue Dec 27 00:12:04 2005
+++ xfce4-modules/combo/Makefile.in Tue Dec 27 00:14:57 2005
@@ -247,7 +247,7 @@ plugindir = $(libdir)/xfce4/modules
plugin_LTLIBRARIES = libxfce4_combo.la
libxfce4_comboincludedir = $(includedir)/xfce4/xfce4-modules
libxfce4_combo_la_SOURCES = combo.c
-libxfce4_combo_la_LDFLAGS = -export-dynamic $(am__append_1)
+libxfce4_combo_la_LDFLAGS = -export-dynamic -module -avoid-version
@HAVE_CYGWIN_TRUE@libxfce4_combo_la_LIBADD = \
@HAVE_CYGWIN_TRUE@ @GTK_LIBS@ \
@HAVE_CYGWIN_TRUE@ @LIBDBH_LIBS@

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-xfce4-modules_mime-applications_Makefile_in,v 1.1 2005/12/27 21:06:09 naddy Exp $
--- xfce4-modules/mime-applications/Makefile.in.orig Tue Dec 27 00:13:56 2005
+++ xfce4-modules/mime-applications/Makefile.in Tue Dec 27 00:14:25 2005
@@ -248,7 +248,7 @@ plugindir = $(libdir)/xfce4/modules
plugin_LTLIBRARIES = libxfce4_mime.la
libxfce4_mimeincludedir = $(includedir)/xfce4/xfce4-modules
libxfce4_mime_la_SOURCES = mime.c
-libxfce4_mime_la_LDFLAGS = -export-dynamic -module $(am__append_1)
+libxfce4_mime_la_LDFLAGS = -export-dynamic -module -avoid-version
@HAVE_CYGWIN_TRUE@libxfce4_mime_la_LIBADD = \
@HAVE_CYGWIN_TRUE@ @LIBXFCE4UTIL_LIBS@ \
@HAVE_CYGWIN_TRUE@ @GTK_LIBS@ \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-xfce4-modules_mime-icons_Makefile_in,v 1.1 2005/12/27 21:06:09 naddy Exp $
--- xfce4-modules/mime-icons/Makefile.in.orig Tue Dec 27 00:15:10 2005
+++ xfce4-modules/mime-icons/Makefile.in Tue Dec 27 00:15:29 2005
@@ -251,7 +251,7 @@ plugindir = $(libdir)/xfce4/modules
plugin_LTLIBRARIES = libxfce4_mime_icons.la
libxfce4_mime_iconsincludedir = $(includedir)/xfce4/xfce4-modules
libxfce4_mime_icons_la_SOURCES = mime_icons.c icon-theme.c icon-theme.h
-libxfce4_mime_icons_la_LDFLAGS = -export-dynamic $(am__append_1)
+libxfce4_mime_icons_la_LDFLAGS = -export-dynamic -module -avoid-version
@HAVE_CYGWIN_TRUE@libxfce4_mime_icons_la_LIBADD = \
@HAVE_CYGWIN_TRUE@ $(top_builddir)/libxfcegui4/libxfcegui4.la \
@HAVE_CYGWIN_TRUE@ @LIBXFCE4UTIL_LIBS@ \

View File

@ -1,8 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/11/10 22:57:38 jolan Exp $ @comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/27 21:06:09 naddy Exp $
@lib lib/libxfcegui4.so.3.6 @lib lib/libxfcegui4.so.${LIBxfcegui4_VERSION}
lib/xfce4/modules/libxfce4_combo.so lib/xfce4/modules/libxfce4_combo.so
@comment @lib lib/xfce4/modules/libxfce4_combo.so.0.0
lib/xfce4/modules/libxfce4_mime.so lib/xfce4/modules/libxfce4_mime.so
@comment @lib lib/xfce4/modules/libxfce4_mime.so.0.0
lib/xfce4/modules/libxfce4_mime_icons.so lib/xfce4/modules/libxfce4_mime_icons.so
@comment @lib lib/xfce4/modules/libxfce4_mime_icons.so.0.0

View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.5 2005/11/16 11:50:03 wilfried Exp $ # $OpenBSD: Makefile,v 1.6 2005/12/27 21:06:09 naddy Exp $
COMMENT= "xfce4 session manager" COMMENT= "xfce4 session manager"
V= 4.2.3 V= 4.2.3
DISTNAME= xfce4-session-${V} DISTNAME= xfce4-session-${V}
PKGNAME= ${DISTNAME}p0 PKGNAME= ${DISTNAME}p0
SHARED_LIBS= xfsm-4.2 0.1
MODGNU_SHARED_LIBS= xfsm-4.2 -export-dynamic
LIBxfsm-4.2_ALIAS= xfsm_4_2
MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/ MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/
HOMEPAGE= http://www.xfce.org/ HOMEPAGE= http://www.xfce.org/
@ -14,8 +17,6 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
USE_LIBTOOL= Yes
MODULES= devel/gettext MODULES= devel/gettext
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \ BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \
:xfce-mcs-manager-*:x11/xfce4/xfce-mcs-manager :xfce-mcs-manager-*:x11/xfce4/xfce-mcs-manager

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/05/12 04:38:38 jolan Exp $ @comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/27 21:06:09 naddy Exp $
@lib lib/libxfsm-4.2.so.0.1 @lib lib/libxfsm-4.2.so.${LIBxfsm-4.2_VERSION}
lib/xfce4/mcs-plugins/session_settings.so lib/xfce4/mcs-plugins/session_settings.so
lib/xfce4/mcs-plugins/splash_settings.so lib/xfce4/mcs-plugins/splash_settings.so
lib/xfce4/splash/engines/libbalou.so lib/xfce4/splash/engines/libbalou.so

View File

@ -1,9 +1,23 @@
# $OpenBSD: Makefile,v 1.4 2005/11/16 10:30:13 wilfried Exp $ # $OpenBSD: Makefile,v 1.5 2005/12/27 21:06:09 naddy Exp $
COMMENT= "xfce4 file manager" COMMENT= "xfce4 file manager"
V= 4.2.3 V= 4.2.3
DISTNAME= xffm-${V} DISTNAME= xffm-${V}
PKGNAME= ${DISTNAME}p0 PKGNAME= ${DISTNAME}p1
SHARED_LIBS= xffm_actions 1.0 \
xffm_basic 1.0 \
xffm_calls 1.0 \
xffm_cpy 1.0 \
xffm_on_demand 1.0 \
xffm_secondary 1.0 \
xffm_tubo 1.0
MODGNU_SHARED_LIBS= xffm_actions -export-dynamic \
xffm_basic -export-dynamic \
xffm_calls -export-dynamic \
xffm_cpy -export-dynamic \
xffm_on_demand -export-dynamic \
xffm_secondary -export-dynamic \
xffm_tubo -export-dynamic
MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/ MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/
HOMEPAGE= http://www.xfce.org/ HOMEPAGE= http://www.xfce.org/
@ -34,15 +48,4 @@ CONFIGURE_ARGS+=--disable-librsvg \
--enable-panel \ --enable-panel \
--enable-scrambledir --enable-scrambledir
# XXX workaround libtool's versioning of simple shared object modules
post-install:
.for n in book find fstab recent trash
${INSTALL_DATA} ${WRKSRC}/modules/.libs/libxffm_${n}.so.1.0 \
${PREFIX}/lib/xfce4/xffm/libxffm_${n}.so
.endfor
${INSTALL_DATA} ${WRKSRC}/modules/.libs/libxffm_prop.so.1.0 \
${PREFIX}/lib/xfce4/xffm/libxffm_prop.so
${INSTALL_DATA} ${WRKSRC}/smb/.libs/libxffm_smb.so.1.0 \
${PREFIX}/lib/xfce4/xffm/libxffm_smb.so
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -0,0 +1,28 @@
$OpenBSD: patch-modules_Makefile_in,v 1.1 2005/12/27 21:06:09 naddy Exp $
--- modules/Makefile.in.orig Tue Dec 27 21:25:29 2005
+++ modules/Makefile.in Tue Dec 27 21:26:12 2005
@@ -310,18 +310,12 @@ libxffm_trash_la_SOURCES = \
libxffm_book_la_SOURCES = \
bookmarks.c bookmarks.h
-libxffm_book_la_LDFLAGS = -export-dynamic -version-info \
- @LIBXFFM_VERINFO@ $(am__append_1)
-libxffm_trash_la_LDFLAGS = -export-dynamic -version-info \
- @LIBXFFM_VERINFO@ $(am__append_2)
-libxffm_recent_la_LDFLAGS = -export-dynamic -version-info \
- @LIBXFFM_VERINFO@ $(am__append_3)
-libxffm_fstab_la_LDFLAGS = -export-dynamic -version-info \
- @LIBXFFM_VERINFO@ $(am__append_4)
-libxffm_prop_la_LDFLAGS = -export-dynamic -version-info \
- @LIBXFFM_VERINFO@ $(am__append_5)
-libxffm_find_la_LDFLAGS = -export-dynamic -version-info \
- @LIBXFFM_VERINFO@ $(am__append_6)
+libxffm_book_la_LDFLAGS = -export-dynamic -module -avoid-version
+libxffm_trash_la_LDFLAGS = -export-dynamic -module -avoid-version
+libxffm_recent_la_LDFLAGS = -export-dynamic -module -avoid-version
+libxffm_fstab_la_LDFLAGS = -export-dynamic -module -avoid-version
+libxffm_prop_la_LDFLAGS = -export-dynamic -module -avoid-version
+libxffm_find_la_LDFLAGS = -export-dynamic -module -avoid-version
@HAVE_CYGWIN_TRUE@cygwin_LDFLAGS = \
@HAVE_CYGWIN_TRUE@ -no-undefined \
@HAVE_CYGWIN_TRUE@ -module \

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-smb_Makefile_in,v 1.1 2005/12/27 21:06:09 naddy Exp $
--- smb/Makefile.in.orig Tue Dec 27 20:27:20 2005
+++ smb/Makefile.in Tue Dec 27 20:27:55 2005
@@ -279,8 +279,7 @@ libxffm_smb_la_SOURCES = \
smblookup.c smblookup.h \
smb_open.c smb_open.h
-libxffm_smb_la_LDFLAGS = -export-dynamic -version-info \
- @LIBXFFM_VERINFO@ $(am__append_1)
+libxffm_smb_la_LDFLAGS = -export-dynamic -module -avoid-version
libxffm_smb_la_CFLAGS = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \

View File

@ -1,23 +1,16 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2005/11/10 22:57:41 jolan Exp $ @comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/27 21:06:09 naddy Exp $
@lib lib/libxffm_actions.so.1.0 @lib lib/libxffm_actions.so.${LIBxffm_actions_VERSION}
@lib lib/libxffm_basic.so.1.0 @lib lib/libxffm_basic.so.${LIBxffm_basic_VERSION}
@lib lib/libxffm_calls.so.1.0 @lib lib/libxffm_calls.so.${LIBxffm_calls_VERSION}
@lib lib/libxffm_cpy.so.1.0 @lib lib/libxffm_cpy.so.${LIBxffm_cpy_VERSION}
@lib lib/libxffm_on_demand.so.1.0 @lib lib/libxffm_on_demand.so.${LIBxffm_on_demand_VERSION}
@lib lib/libxffm_secondary.so.1.0 @lib lib/libxffm_secondary.so.${LIBxffm_secondary_VERSION}
@lib lib/libxffm_tubo.so.1.0 @lib lib/libxffm_tubo.so.${LIBxffm_tubo_VERSION}
lib/xfce4/mcs-plugins/libxffmsettings.so lib/xfce4/mcs-plugins/libxffmsettings.so
lib/xfce4/xffm/libxffm_book.so lib/xfce4/xffm/libxffm_book.so
@comment lib/xfce4/xffm/libxffm_book.so.1.0
lib/xfce4/xffm/libxffm_find.so lib/xfce4/xffm/libxffm_find.so
@comment lib/xfce4/xffm/libxffm_find.so.1.0
lib/xfce4/xffm/libxffm_fstab.so lib/xfce4/xffm/libxffm_fstab.so
@comment lib/xfce4/xffm/libxffm_fstab.so.1.0
lib/xfce4/xffm/libxffm_prop.so lib/xfce4/xffm/libxffm_prop.so
@comment lib/xfce4/xffm/libxffm_prop.so.0.0
lib/xfce4/xffm/libxffm_recent.so lib/xfce4/xffm/libxffm_recent.so
@comment lib/xfce4/xffm/libxffm_recent.so.1.0
lib/xfce4/xffm/libxffm_smb.so lib/xfce4/xffm/libxffm_smb.so
@comment lib/xfce4/xffm/libxffm_smb.so.1.0
lib/xfce4/xffm/libxffm_trash.so lib/xfce4/xffm/libxffm_trash.so
@comment lib/xfce4/xffm/libxffm_trash.so.1.0