SHARED_LIBS, USE_LIBTOOL

This commit is contained in:
naddy 2006-01-01 22:23:03 +00:00
parent 49b3093ffa
commit 06aed2f174
15 changed files with 28 additions and 211 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2005/11/20 13:29:19 wilfried Exp $
# $OpenBSD: Makefile,v 1.11 2006/01/01 22:23:03 naddy Exp $
COMMENT= "C++ interface for the GNOME libraries"
COMMENT-docs= "C++ interface for the GNOME libraries documentation"
@ -7,6 +7,8 @@ VERSION= 1.2.3
DISTNAME= gnomemm-${VERSION}
PKGNAME= ${DISTNAME}p0
PKGNAME-docs= gnomemm-docs-${VERSION}
SHARED_LIBS= gnomemm 9.4
MODGNU_SHARED_LIBS= gnomemm -no-undefined
CATEGORIES= devel x11
HOMEPAGE= http://gtkmm.sourceforge.net/

View File

@ -1,64 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2002/12/17 09:45:44 wilfried Exp $
--- configure.orig Tue Jul 23 14:12:00 2002
+++ configure Tue Dec 17 09:03:23 2002
@@ -2094,6 +2094,16 @@ newos6*)
lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
+openbsd*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ else
+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+ fi
+ ;;
+
osf3* | osf4* | osf5*)
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -3356,7 +3366,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -3760,8 +3772,8 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
;;
@@ -3917,6 +3929,7 @@ else
ld_shlibs=no
;;
esac
+ PATH_SEPARATOR=$lt_cv_sys_path_separator
fi
echo "$ac_t""$ld_shlibs" 1>&6
test "$ld_shlibs" = no && can_build_shared=no
@@ -4240,10 +4253,9 @@ newsos6)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_overrides_runpath=yes
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_gnome--_Makefile_in,v 1.2 2004/01/05 01:49:17 espie Exp $
--- src/gnome--/Makefile.in.orig 2002-07-23 14:29:48.000000000 +0200
+++ src/gnome--/Makefile.in 2004-01-05 02:22:26.000000000 +0100
@@ -165,7 +165,7 @@ gnomemm_DATA = $(gnomemmh) imlib.h app-h
# This builds the library
libgnomemm_la_SOURCES = $(gnomemmc) app-helper.cc app-callback.cc point.cc affinetrans.cc construct_copies.cc
-libgnomemm_la_LDFLAGS = -version-info $(LIBGNOMEMM_SO_VERSION) -release $(GNOMEMM_RELEASE) -no-undefined
+libgnomemm_la_LDFLAGS = -version-info $(LIBGNOMEMM_SO_VERSION) -no-undefined
libgnomemm_la_LIBADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(gnomemmla)
libgnomemm_la_DEPENDENCIES = $(gnomemmla)

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2004/09/15 19:26:29 espie Exp $
@lib lib/libgnomemm.so.9.4
@comment $OpenBSD: PFRAG.shared,v 1.5 2006/01/01 22:23:03 naddy Exp $
@lib lib/libgnomemm.so.${LIBgnomemm_VERSION}

View File

@ -1,9 +1,11 @@
# $OpenBSD: Makefile,v 1.60 2005/10/30 00:10:42 fgsch Exp $
# $OpenBSD: Makefile,v 1.61 2006/01/01 22:23:03 naddy Exp $
COMMENT= "General Toolkit for X11 GUI"
DISTNAME= gtk+-1.2.10
PKGNAME= ${DISTNAME}p3
PKGNAME= ${DISTNAME}p4
SHARED_LIBS= gdk 2.0 \
gtk 2.0
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/1.2/}
@ -21,6 +23,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xi m
USE_X11= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --with-xinput="xfree"
@ -29,11 +32,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${DEPBASE}/include" \
LDFLAGS="-L${DEPBASE}/lib" \
glib_config_args=--prefix=${DEPBASE}
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltconfig \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltmain_sh \
patch-*
post-extract:
@cd ${WRKSRC}/docs; rm -f gtk.info* gdk.info*
.include <bsd.port.mk>

View File

@ -1,87 +0,0 @@
$OpenBSD: patch-docs_Makefile_in,v 1.1 2001/02/20 17:26:50 danh Exp $
--- docs/Makefile.in.orig Wed May 24 21:12:15 2000
+++ docs/Makefile.in Tue Feb 20 12:21:33 2001
@@ -98,7 +98,7 @@ LT_CURRENT = @LT_CURRENT@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
@@ -185,46 +185,40 @@ gtk.dvi: gtk.texi
DVIPS = dvips
.texi.info:
- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+ @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+ $(MAKEINFO) -I $(srcdir) $<
.texi.dvi:
TEXINPUTS=.:$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
.texi:
- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+ @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+ $(MAKEINFO) -I $(srcdir) $<
.texinfo.info:
- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+ @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+ $(MAKEINFO) -I $(srcdir) $<
.texinfo:
- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+ @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+ $(MAKEINFO) -I $(srcdir) $<
.texinfo.dvi:
TEXINPUTS=.:$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
.txi.info:
- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+ @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+ $(MAKEINFO) -I $(srcdir) $<
.txi.dvi:
TEXINPUTS=.:$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
.txi:
- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+ @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+ $(MAKEINFO) -I $(srcdir) $<
.dvi.ps:
$(DVIPS) $< -o $@
@@ -233,11 +227,10 @@ install-info-am: $(INFO_DEPS)
$(mkinstalldirs) $(DESTDIR)$(infodir)
@list='$(INFO_DEPS)'; \
for file in $$list; do \
- d=$(srcdir); \
- for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
- if test -f $$d/$$ifile; then \
- echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
- $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
+ for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+ if test -f $$ifile; then \
+ echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$ifile"; \
+ $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$ifile; \
else : ; fi; \
done; \
done

View File

@ -5,7 +5,7 @@
# libtool stuff: set version and export symbols for resolving
libgdkincludedir = $(includedir)/gtk-1.2/gdk
-libgdk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@
+libgdk_la_LDFLAGS = @STRIP_BEGIN@ -version-info 2:0:0 -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@
+libgdk_la_LDFLAGS = @STRIP_BEGIN@ $(LIBgdk_LTVERSION) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@
#

View File

@ -14,7 +14,7 @@
# libtool stuff: set version and export symbols for resolving
libgtkincludedir = $(includedir)/gtk-1.2/gtk
-libgtk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@
+libgtk_la_LDFLAGS = @STRIP_BEGIN@ -version-info 2:0:0 -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@
+libgtk_la_LDFLAGS = @STRIP_BEGIN@ $(LIBgtk_LTVERSION) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@
# $(top_builddir)/gdk/libgdk.la

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/05/11 19:18:43 alek Exp $
@lib lib/libgdk.so.2.0
@lib lib/libgtk.so.2.0
@comment $OpenBSD: PFRAG.shared,v 1.5 2006/01/01 22:23:03 naddy Exp $
@lib lib/libgdk.so.${LIBgdk_VERSION}
@lib lib/libgtk.so.${LIBgtk_VERSION}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.32 2005/05/11 19:18:43 alek Exp $
@comment $OpenBSD: PLIST,v 1.33 2006/01/01 22:23:03 naddy Exp $
%%SHARED%%
bin/gtk-config
include/gtk-1.2/
@ -138,8 +138,6 @@ share/aclocal/gtk.m4
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/gtk+.mo
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/gtk+.mo
share/locale/cs/LC_MESSAGES/gtk+.mo
share/locale/da/LC_MESSAGES/gtk+.mo
@ -152,8 +150,6 @@ share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/gtk+.mo
share/locale/fi/LC_MESSAGES/gtk+.mo
share/locale/fr/LC_MESSAGES/gtk+.mo
share/locale/ga/
share/locale/ga/LC_MESSAGES/
share/locale/ga/LC_MESSAGES/gtk+.mo
share/locale/gl/LC_MESSAGES/gtk+.mo
share/locale/hr/LC_MESSAGES/gtk+.mo
@ -177,14 +173,10 @@ share/locale/sl/LC_MESSAGES/gtk+.mo
share/locale/sp/
share/locale/sp/LC_MESSAGES/
share/locale/sp/LC_MESSAGES/gtk+.mo
share/locale/sr/
share/locale/sr/LC_MESSAGES/
share/locale/sr/LC_MESSAGES/gtk+.mo
share/locale/sv/LC_MESSAGES/gtk+.mo
share/locale/tr/LC_MESSAGES/gtk+.mo
share/locale/uk/LC_MESSAGES/gtk+.mo
share/locale/vi/
share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/gtk+.mo
share/locale/wa/
share/locale/wa/LC_MESSAGES/

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2005/02/21 19:55:37 alek Exp $
# $OpenBSD: Makefile,v 1.3 2006/01/01 22:23:03 naddy Exp $
COMMENT= "GTK Extra Widget Set"
DISTNAME= gtk+extra-0.99.17
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
SHARED_LIBS= gtkextra 17.0
CATEGORIES= x11 devel
HOMEPAGE= http://gtkextra.sourceforge.net
@ -20,7 +21,9 @@ MASTER_SITES= ${HOMEPAGE}/src/
BUILD_DEPENDS= gtk.1.2,glib.1.2::x11/gtk+
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-gtkextra_Makefile_in,v 1.1.1.1 2003/01/22 17:10:59 margarida Exp $
$OpenBSD: patch-gtkextra_Makefile_in,v 1.2 2006/01/01 22:23:04 naddy Exp $
--- gtkextra/Makefile.in.orig Tue Jan 21 20:22:23 2003
+++ gtkextra/Makefile.in Tue Jan 21 20:22:50 2003
@@ -126,7 +126,7 @@ libgtkextrainclude_HEADERS = $(gtkextra_
@ -6,7 +6,7 @@ $OpenBSD: patch-gtkextra_Makefile_in,v 1.1.1.1 2003/01/22 17:10:59 margarida Exp
lib_LTLIBRARIES = libgtkextra.la
libgtkextra_la_SOURCES = $(gtkextra_c_sources)
-libgtkextra_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic $(shell gtk-config --libs) $(GTKGL_LIBS)
+libgtkextra_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LT_RELEASE) -export-dynamic $(shell gtk-config --libs) $(GTKGL_LIBS)
+libgtkextra_la_LDFLAGS = $(LIBgtkextra_LTVERSION) -export-dynamic $(shell gtk-config --libs) $(GTKGL_LIBS)
EXTRA_HEADERS =
EXTRA_DIST = $(gtkextra_private_h_sources) gtkextra.def Makefile.win32 makefile.msc sat.xpm sg_small.xpm cloud.xpm suncloud.xpm testgtkplotdt.in

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gtkextra_gtkplotps_c,v 1.1.1.1 2003/01/22 17:10:59 margarida Exp $
--- gtkextra/gtkplotps.c.orig Wed Jan 15 19:26:24 2003
+++ gtkextra/gtkplotps.c Wed Jan 15 19:26:51 2003
@@ -34,7 +34,7 @@
#include <ctype.h>
#include <time.h>
#include <gtk/gtk.h>
-#include <wctype.h>
+/* #include <wctype.h> */ /* OpenBSD doesn't have ctype.h for wide chars */
#include <locale.h>
#include "gtkplot.h"

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 19:26:29 espie Exp $
@lib lib/libgtkextra.so.17.0
@comment $OpenBSD: PFRAG.shared,v 1.3 2006/01/01 22:23:04 naddy Exp $
@lib lib/libgtkextra.so.${LIBgtkextra_VERSION}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 19:26:29 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2006/01/01 22:23:04 naddy Exp $
bin/gtkextra-config
include/gtkextra/
include/gtkextra/gtkbordercombo.h
@ -36,6 +36,5 @@ include/gtkextra/gtksheet.h
include/gtkextra/gtktogglecombo.h
lib/libgtkextra.a
lib/libgtkextra.la
share/aclocal/
share/aclocal/gtkextra.m4
%%SHARED%%