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

update to xmxl-2.5

Browse Source 
mostly from Piotr Sikora, thanks
This commit is contained in:
jakemsr 2009-01-17 20:28:27 +00:00
parent 58f0679130
commit 4f124f1aaf
5 changed files with 61 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
textproc/mxml/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2007/10/01 18:40:11 jakemsr Exp $
# $OpenBSD: Makefile,v 1.2 2009/01/17 20:28:27 jakemsr Exp $
COMMENT= minimal XML library
DISTNAME= mxml-2.2.2
DISTNAME= mxml-2.5
SHARED_LIBS= mxml 0.0 # 1.0
SHARED_LIBS= mxml 0.1 # 1.4
CATEGORIES= textproc
@ -12,7 +12,7 @@ HOMEPAGE= http://www.easysw.com/~mike/mxml/
MAINTAINER= Jacob Meuser <jakemsr@openbsd.org>
# LGPL
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -20,10 +20,10 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
MASTER_SITES= ftp://ftp.easysw.com/pub/mxml/2.2.2/
MASTER_SITES= ftp://ftp.easysw.com/pub/mxml/2.5/
CONFIGURE_STYLE= gnu dest
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} --disable-threads
CONFIGURE_ENV+= LIBmxml_VERSION=${LIBmxml_VERSION}
MAKE_ENV+= LIBmxml_VERSION=${LIBmxml_VERSION}

10
textproc/mxml/distinfo
View File

@ -1,5 +1,5 @@
MD5 (mxml-2.2.2.tar.gz) = 72mGKtMO8v5mRXQV21tatA==
RMD160 (mxml-2.2.2.tar.gz) = jRcEy1S66ql5qd+EnnVaMYHIOXk=
SHA1 (mxml-2.2.2.tar.gz) = P6zYIapNVYJUv3wJ50MGiB+5EPo=
SHA256 (mxml-2.2.2.tar.gz) = y4T4IgN8Ry2lftOLzVd6YUAx13yVzVJPK2WMWeTVFHY=
SIZE (mxml-2.2.2.tar.gz) = 204522
MD5 (mxml-2.5.tar.gz) = 9wY3f7pjCzn6Av1jZCsX5Q==
RMD160 (mxml-2.5.tar.gz) = qjFetJksOt1f+8trALhU2CZ3qXE=
SHA1 (mxml-2.5.tar.gz) = S4FtwS3uhAQgd2+nLsxB1XXKVMw=
SHA256 (mxml-2.5.tar.gz) = rvBUHQWJvjUMUMf+W8caDrEEbQ849rJzSLY8qiGuvHk=
SIZE (mxml-2.5.tar.gz) = 247768

38
textproc/mxml/patches/patch-Makefile_in
View File

@ -1,40 +1,40 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/10/01 18:40:11 jakemsr Exp $
--- Makefile.in.orig Sun Apr 24 16:23:59 2005
+++ Makefile.in Sat Sep 29 18:26:28 2007
@@ -148,13 +148,13 @@ install-libmxml.a:
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
$OpenBSD: patch-Makefile_in,v 1.2 2009/01/17 20:28:28 jakemsr Exp $
--- Makefile.in.orig Tue Nov 18 06:25:18 2008
+++ Makefile.in Tue Nov 18 07:55:52 2008
@@ -143,13 +143,13 @@ install-libmxml.a:
$(INSTALL_LIB) libmxml.a $(BUILDROOT)$(libdir)
$(RANLIB) $(BUILDROOT)$(libdir)/libmxml.a
-install-libmxml.so.1.0:
-install-libmxml.so.1.4:
+install-libmxml.so.$(LIBmxml_VERSION):
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
- $(INSTALL_LIB) libmxml.so.1.0 $(BUILDROOT)$(libdir)
- $(INSTALL_LIB) libmxml.so.1.4 $(BUILDROOT)$(libdir)
- $(RM) $(BUILDROOT)$(libdir)/libmxml.so
- $(LN) libmxml.so.1.0 $(BUILDROOT)$(libdir)/libmxml.so
- $(LN) libmxml.so.1.4 $(BUILDROOT)$(libdir)/libmxml.so
- $(RM) $(BUILDROOT)$(libdir)/libmxml.so.1
- $(LN) libmxml.so.1.0 $(BUILDROOT)$(libdir)/libmxml.so.1
- $(LN) libmxml.so.1.4 $(BUILDROOT)$(libdir)/libmxml.so.1
+ $(INSTALL_LIB) libmxml.so.$(LIBmxml_VERSION) $(BUILDROOT)$(libdir)
+# $(RM) $(BUILDROOT)$(libdir)/libmxml.so
+# $(LN) libmxml.so.1.0 $(BUILDROOT)$(libdir)/libmxml.so
+# $(LN) libmxml.so.1.4 $(BUILDROOT)$(libdir)/libmxml.so
+# $(RM) $(BUILDROOT)$(libdir)/libmxml.so.1
+# $(LN) libmxml.so.1.0 $(BUILDROOT)$(libdir)/libmxml.so.1
+# $(LN) libmxml.so.1.4 $(BUILDROOT)$(libdir)/libmxml.so.1
install-libmxml.sl.1:
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
@@ -261,11 +261,11 @@ $(LIBOBJS): mxml.h
# libmxml.so.1.0
@@ -244,11 +244,11 @@ mxml-entity.o mxml-file.o mxml-private.o: mxml-private
# libmxml.so.1.4
#
-libmxml.so.1.0: $(LIBOBJS)
- $(DSO) $(DSOFLAGS) -o libmxml.so.1.0 $(LIBOBJS)
-libmxml.so.1.4: $(LIBOBJS)
- $(DSO) $(DSOFLAGS) -o libmxml.so.1.4 $(LIBOBJS)
- $(RM) libmxml.so libmxml.so.1
- $(LN) libmxml.so.1.0 libmxml.so
- $(LN) libmxml.so.1.0 libmxml.so.1
- $(LN) libmxml.so.1.4 libmxml.so
- $(LN) libmxml.so.1.4 libmxml.so.1
+libmxml.so.$(LIBmxml_VERSION): $(LIBOBJS)
+ $(DSO) $(DSOFLAGS) -o libmxml.so.$(LIBmxml_VERSION) $(LIBOBJS)
+# $(RM) libmxml.so libmxml.so.1
+# $(LN) libmxml.so.1.0 libmxml.so
+# $(LN) libmxml.so.1.0 libmxml.so.1
+# $(LN) libmxml.so.1.4 libmxml.so
+# $(LN) libmxml.so.1.4 libmxml.so.1
#

46
textproc/mxml/patches/patch-configure
View File

@ -1,36 +1,26 @@
$OpenBSD: patch-configure,v 1.1.1.1 2007/10/01 18:40:11 jakemsr Exp $
--- configure.orig Thu May 19 07:56:05 2005
+++ configure Sat Sep 29 18:23:35 2007
@@ -1247,7 +1247,7 @@ CFLAGS="${CFLAGS:=}"
CXXFLAGS="${CXXFLAGS:=}"
LDFLAGS="${LDFLAGS:=}"
-OPTIM="-O"
+# OPTIM="-O"
@@ -1265,7 +1265,7 @@ if test "${enable_debug+set}" = set; then
if eval "test x$enable_debug = xyes"; then
OPTIM="-g"
else
- LDFLAGS="$LDFLAGS -s"
+ LDFLAGS="$LDFLAGS"
fi
fi;
@@ -3189,10 +3189,10 @@ echo "${ECHO_T}yes" >&6
$OpenBSD: patch-configure,v 1.2 2009/01/17 20:28:28 jakemsr Exp $
--- configure.orig Sat Jan 26 12:50:28 2008
+++ configure Mon Jan 12 00:26:29 2009
@@ -4661,10 +4661,10 @@ echo "${ECHO_T}yes" >&6; }
*BSD*)
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
- LIBMXML="libmxml.so.1.0"
- DSO="\$(CC)"
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- LIBMXML="libmxml.so.1.4"
+ LIBMXML="libmxml.so.${LIBmxml_VERSION}"
DSO="\$(CC)"
- DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)"
- LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
+ LIBMXML="libmxml.so.${LIBmxml_VERSION}"
+ DSO="\$(CC)"
+ DSOFLAGS="$DSOFLAGS -shared"
+ LDFLAGS="$LDFLAGS"
;;
Darwin*)
@@ -4698,7 +4698,7 @@ if test -n "$GCC"; then
CFLAGS="-Wall $CFLAGS"
if test "x$OPTIM" = x; then
- OPTIM="-Os -g"
+ : # OPTIM="-Os -g"
fi
if test "x$use_ansi" = xyes; then

19
textproc/mxml/pkg/PLIST
View File

@ -1,17 +1,24 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/10/01 18:40:11 jakemsr Exp $
@comment $OpenBSD: PLIST,v 1.2 2009/01/17 20:28:28 jakemsr Exp $
%%SHARED%%
bin/mxmldoc
@bin bin/mxmldoc
include/mxml.h
lib/libmxml.a
lib/pkgconfig/
lib/pkgconfig/mxml.pc
@man man/cat1/mxmldoc.0
@man man/cat3/mxml.0
@comment man/man1/mxmldoc.1
@comment man/man3/mxml.3
@man man/man1/mxmldoc.1
@man man/man3/mxml.3
share/doc/mxml/
share/doc/mxml/0.gif
share/doc/mxml/1.gif
share/doc/mxml/2.gif
share/doc/mxml/3.gif
share/doc/mxml/4.gif
share/doc/mxml/A.gif
share/doc/mxml/B.gif
share/doc/mxml/C.gif
share/doc/mxml/CHANGES
share/doc/mxml/COPYING
share/doc/mxml/D.gif
share/doc/mxml/README
share/doc/mxml/mxml.html
share/doc/mxml/mxmldoc.xsd