diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2010-10-05 19:57:56 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2010-10-05 19:57:56 +0000 |
| commit | 7e80cde3289d108a73c54656f4fde354dd2fb09e (patch) | |
| tree | b85b705571d426ca1d0ff74b6af8f029081a6a39 /editors/xmlcopyeditor | |
| parent | 6abe3f75658b0457864b49c9fdaf298b79f2c447 (diff) | |
| download | ports-7e80cde3289d108a73c54656f4fde354dd2fb09e.tar.gz ports-7e80cde3289d108a73c54656f4fde354dd2fb09e.zip | |
Round one migration of ports from automake{19,110} to automake111
Notes
Notes:
svn path=/head/; revision=262460
Diffstat (limited to 'editors/xmlcopyeditor')
| -rw-r--r-- | editors/xmlcopyeditor/Makefile | 10 | ||||
| -rw-r--r-- | editors/xmlcopyeditor/files/patch-configure.in.diff | 12 | ||||
| -rw-r--r-- | editors/xmlcopyeditor/files/patch-src_Makefile.in.diff (renamed from editors/xmlcopyeditor/files/patch-src_Makefile.am.diff) | 16 |
3 files changed, 5 insertions, 33 deletions
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile index 0df3b13361e2..c604bfdd9143 100644 --- a/editors/xmlcopyeditor/Makefile +++ b/editors/xmlcopyeditor/Makefile @@ -39,15 +39,7 @@ LIB_DEPENDS+= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -# workaround for automake (it needs config.rpath) -post-extract: - ${TOUCH} ${WRKSRC}/config.rpath - -# iconv.m4 is located in ${LOCALBASE}/share/aclocal -ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal -USE_AUTOTOOLS= aclocal:110 autoconf:267 automake:110 libtool:22 - -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \ -I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/editors/xmlcopyeditor/files/patch-configure.in.diff b/editors/xmlcopyeditor/files/patch-configure.in.diff deleted file mode 100644 index 0e7f6af76fb8..000000000000 --- a/editors/xmlcopyeditor/files/patch-configure.in.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.in.orig -+++ configure.in -@@ -35,6 +35,9 @@ - # Call WXTEST func - WXTEST - -+# Call iconv checks -+AM_ICONV -+ - # Verify minimus requires - vers=`echo $wxversion | $AWK 'BEGIN { FS = "."; } { printf "% d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test -n "$vers" && test "$vers" -ge 2008000; then diff --git a/editors/xmlcopyeditor/files/patch-src_Makefile.am.diff b/editors/xmlcopyeditor/files/patch-src_Makefile.in.diff index b31b629663b3..de0ea14e7441 100644 --- a/editors/xmlcopyeditor/files/patch-src_Makefile.am.diff +++ b/editors/xmlcopyeditor/files/patch-src_Makefile.in.diff @@ -1,19 +1,13 @@ ---- src/Makefile.am.orig -+++ src/Makefile.am -@@ -9,8 +9,8 @@ - bin_PROGRAMS = xmlcopyeditor - bindir = ${prefix}/bin +--- src/Makefile.in.orig 2009-04-14 11:38:17.000000000 -0500 ++++ src/Makefile.in 2010-10-02 16:22:21.000000000 -0500 +@@ -228,4 +228,4 @@ xmlcopyeditordir = ${prefix}/share/xmlcopyeditor -pixmapdir = /usr/share/pixmaps -applicationsdir = /usr/share/applications +pixmapdir = ${prefix}/share/pixmaps +applicationsdir = ${prefix}/share/applications - # the application source, library search path, and link libraries - xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \ -@@ -49,15 +49,6 @@ - templates/*.lzx \ - templates/*.xlf \ +@@ -269,11 +269,2 @@ help/*.* help/html/*.* \ - copying/*.txt copying/boost_shared_ptr/* \ - copying/Expat/* copying/libxml2/* copying/libxslt/* \ @@ -25,5 +19,3 @@ - copying/Apache/LICENSE-2.0 \ - copying/Apache/LICENSE-2_files/* \ po/sk/messages.mo \ - po/sv/messages.mo \ - po/fr/messages.mo \ |