Index: gpgme03/Makefile =================================================================== RCS file: /home/ncvs/ports/security/gpgme03/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- gpgme03/Makefile 11 Dec 2004 05:28:32 -0000 1.22 +++ gpgme03/Makefile 20 Dec 2004 13:35:27 -0000 @@ -20,9 +20,13 @@ USE_INC_LIBTOOL_VER=13 USE_GMAKE= yes +USE_AUTOCONF_VER= 259 INSTALLS_SHLIB= yes +USE_REINPLACE= YES -INFO= gpgme +INFO= gpgme03 + +CONFIGURE_ARGS+= --includedir=${PREFIX}/include/gpgme03 .include @@ -36,4 +40,10 @@ CONFIGURE_ARGS+= --without-gpgsm .endif +post-patch: +.for i in tests tests/gpg tests/gpgsm + @${REINPLACE_CMD} -e 's/libgpgme.la/libgpgme03.la/' \ + ${WRKSRC}/${i}/Makefile.in +.endfor + .include Index: gpgme03/pkg-plist =================================================================== RCS file: /home/ncvs/ports/security/gpgme03/pkg-plist,v retrieving revision 1.7 diff -u -r1.7 pkg-plist --- gpgme03/pkg-plist 6 Jan 2004 14:18:02 -0000 1.7 +++ gpgme03/pkg-plist 20 Dec 2004 14:52:34 -0000 @@ -1,6 +1,7 @@ -bin/gpgme-config -include/gpgme.h -lib/libgpgme.a -lib/libgpgme.so -lib/libgpgme.so.9 -share/aclocal/gpgme.m4 +bin/gpgme03-config +include/gpgme03/gpgme.h +lib/libgpgme03.a +lib/libgpgme03.so +lib/libgpgme03.so.9 +share/aclocal/gpgme03.m4 +@dirrm include/gpgme03 Index: gpgme03/files/patch-configure.ac =================================================================== RCS file: gpgme03/files/patch-configure.ac diff -N gpgme03/files/patch-configure.ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gpgme03/files/patch-configure.ac 20 Dec 2004 09:48:13 -0000 @@ -0,0 +1,11 @@ +--- configure.ac.orig Mon Dec 20 10:46:39 2004 ++++ configure.ac Mon Dec 20 10:47:30 2004 +@@ -246,7 +246,7 @@ + GNUPG_FIX_HDR_VERSION(gpgme/gpgme.h, GPGME_VERSION) + + dnl Substitution used for gpgme-config +-GPGME_CONFIG_LIBS="-lgpgme" ++GPGME_CONFIG_LIBS="-lgpgme03" + GPGME_CONFIG_CFLAGS="" + AC_SUBST(GPGME_CONFIG_LIBS) + AC_SUBST(GPGME_CONFIG_CFLAGS) Index: gpgme03/files/patch-doc:Makefile.in =================================================================== RCS file: gpgme03/files/patch-doc:Makefile.in diff -N gpgme03/files/patch-doc:Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gpgme03/files/patch-doc:Makefile.in 20 Dec 2004 11:32:44 -0000 @@ -0,0 +1,20 @@ +--- doc/Makefile.in.orig Wed Nov 19 09:55:09 2003 ++++ doc/Makefile.in Mon Dec 20 12:32:30 2004 +@@ -398,7 +398,7 @@ + for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ + $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ + if test -f $$ifile; then \ +- relfile=`echo "$$ifile" | sed 's|^.*/||'`; \ ++ relfile=`echo "$$ifile" | sed 's|^.*/||;s|gpgme|gpgme03|'`; \ + echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \ + $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \ + else : ; fi; \ +@@ -409,7 +409,7 @@ + install-info --version | grep -i -v debian) >/dev/null 2>&1; then \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ +- relfile=`echo "$$file" | sed 's|^.*/||'`; \ ++ relfile=`echo "$$file" | sed 's|^.*/||;s|gpgme|gpgme03|'`; \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\ + install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile || :;\ + done; \ Index: gpgme03/files/patch-doc:gpgme.info =================================================================== RCS file: gpgme03/files/patch-doc:gpgme.info diff -N gpgme03/files/patch-doc:gpgme.info --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gpgme03/files/patch-doc:gpgme.info 20 Dec 2004 11:37:56 -0000 @@ -0,0 +1,11 @@ +--- doc/gpgme.info.orig Mon Dec 20 12:37:07 2004 ++++ doc/gpgme.info Mon Dec 20 12:37:25 2004 +@@ -2,7 +2,7 @@ + + INFO-DIR-SECTION GNU Libraries + START-INFO-DIR-ENTRY +-* GPGME: (gpgme). Adding support for cryptography to your program. ++* GPGME: (gpgme03). Adding support for cryptography to your program. + END-INFO-DIR-ENTRY + + This file documents the GPGME library. Index: gpgme03/files/patch-gpgme:Makefile.in =================================================================== RCS file: gpgme03/files/patch-gpgme:Makefile.in diff -N gpgme03/files/patch-gpgme:Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gpgme03/files/patch-gpgme:Makefile.in 20 Dec 2004 13:34:28 -0000 @@ -0,0 +1,47 @@ +--- gpgme/Makefile.in.orig Wed Nov 19 09:55:10 2003 ++++ gpgme/Makefile.in Mon Dec 20 14:34:26 2004 +@@ -175,7 +175,7 @@ + m4datadir = $(datadir)/aclocal + m4data_DATA = gpgme.m4 + include_HEADERS = gpgme.h +-lib_LTLIBRARIES = libgpgme.la ++lib_LTLIBRARIES = libgpgme03.la + + libgpgme_la_LDFLAGS = -version-info \ + @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@ +@@ -277,7 +277,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ $(AM_LDFLAGS) $(LDFLAGS) -o libgpgme03.la + DIST_SOURCES = $(am__libgpgme_la_SOURCES_DIST) + DATA = $(m4data_DATA) + +@@ -327,7 +327,7 @@ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +-libgpgme.la: $(libgpgme_la_OBJECTS) $(libgpgme_la_DEPENDENCIES) ++libgpgme03.la: $(libgpgme_la_OBJECTS) $(libgpgme_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgpgme_la_LDFLAGS) $(libgpgme_la_OBJECTS) $(libgpgme_la_LIBADD) $(LIBS) + binSCRIPT_INSTALL = $(INSTALL_SCRIPT) + install-binSCRIPTS: $(bin_SCRIPTS) +@@ -336,7 +336,7 @@ + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ f=`echo "$$p" | sed 's|^.*/||;s|gpgme|gpgme03|'`; \ + echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ + $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ + else :; fi; \ +@@ -450,7 +450,7 @@ + $(mkinstalldirs) $(DESTDIR)$(m4datadir) + @list='$(m4data_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ f="`echo $$p | sed -e 's|^.*/||;s/gpgme/gpgme03/'`"; \ + echo " $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f"; \ + $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f; \ + done