diff -urN /usr/ports/devel/dotconf/Makefile devel/dotconf/Makefile --- /usr/ports/devel/dotconf/Makefile 2010-12-04 22:17:32.000000000 +0900 +++ devel/dotconf/Makefile 2011-09-17 05:10:01.000000000 +0900 @@ -7,30 +7,44 @@ # PORTNAME= dotconf -PORTVERSION= 1.1.0 +PORTVERSION= 1.3 CATEGORIES= devel -MASTER_SITES= http://www.azzit.de/dotconf/download/v1.1/ +MASTER_SITES= GENTOO/distfiles MAINTAINER= ports@FreeBSD.org COMMENT= A simple, powerful configuration-file parser -USE_AUTOTOOLS= libtool +LICENSE= LGPL21 # (or later) +LICENSE_FILE= ${WRKSRC}/COPYING + USE_GNOME= gnomehack pkgconfig -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -pre-patch: - @${REINPLACE_CMD} -e 's|-Wall -g||' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-release $(LT_RELEASE)||' ${WRKSRC}/src/Makefile.in +PORTDOCS= * +PORTEXAMPLES= * +PLIST_FILES= include/dotconf.h \ + lib/libdotconf.a \ + lib/libdotconf.la \ + lib/libdotconf.so \ + lib/libdotconf.so.0 \ + libdata/pkgconfig/dotconf.pc + +post-patch: + @${REINPLACE_CMD} -e \ + '/^SUBDIR/s|=.*|= src|' ${WRKSRC}/Makefile.in post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR} +.endif +.if !defined(NOPORTEXAMPLES) @${MKDIR} ${EXAMPLESDIR} - ${TAR} -C ${WRKSRC}/examples -cf - . | \ - ${TAR} -C ${EXAMPLESDIR} --unlink -xf - - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} +.for ex in README argdouble caseinsensitive context duplicates errorhandler \ + fallback libpool maketest.sh modules noinline simple + @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} ${ex} ${EXAMPLESDIR}) +.endfor .endif .include diff -urN /usr/ports/devel/dotconf/distinfo devel/dotconf/distinfo --- /usr/ports/devel/dotconf/distinfo 2011-07-04 01:57:19.000000000 +0900 +++ devel/dotconf/distinfo 2011-09-10 06:36:10.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (dotconf-1.1.0.tar.gz) = 84e2a0f2ddfcc5b4692a02cc9c5708d8dcb24205d9482cc016733fe297597806 -SIZE (dotconf-1.1.0.tar.gz) = 199548 +SHA256 (dotconf-1.3.tar.gz) = b0bccd7251df50b68b82888c5f9fa7932bd68ee3b9e880bce9456e692bf13e8e +SIZE (dotconf-1.3.tar.gz) = 333301 diff -urN /usr/ports/devel/dotconf/files/patch-ltmain.sh devel/dotconf/files/patch-ltmain.sh --- /usr/ports/devel/dotconf/files/patch-ltmain.sh 2002-01-30 10:48:11.000000000 +0900 +++ devel/dotconf/files/patch-ltmain.sh 1970-01-01 09:00:00.000000000 +0900 @@ -1,25 +0,0 @@ ---- ltmain.sh.orig Thu Jul 26 18:28:06 2001 -+++ ltmain.sh Sun Jan 27 23:19:36 2002 -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4175,10 +4178,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff -urN /usr/ports/devel/dotconf/pkg-descr devel/dotconf/pkg-descr --- /usr/ports/devel/dotconf/pkg-descr 2009-11-12 16:32:47.000000000 +0900 +++ devel/dotconf/pkg-descr 2011-09-10 05:02:22.000000000 +0900 @@ -11,4 +11,4 @@ To keep dotconf from printing out warnings, you can install your own customized error handler. -WWW: http://www.azzit.de/dotconf/ +WWW: http://github.com/williamh/dotconf diff -urN /usr/ports/devel/dotconf/pkg-plist devel/dotconf/pkg-plist --- /usr/ports/devel/dotconf/pkg-plist 2007-01-28 18:07:37.000000000 +0900 +++ devel/dotconf/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,83 +0,0 @@ -@comment $FreeBSD: ports/devel/dotconf/pkg-plist,v 1.12 2007/01/28 09:07:37 kris Exp $ -bin/dotconf-config -include/dotconf.h -include/libpool.h -lib/libdotconf.a -lib/libdotconf.la -lib/libdotconf.so -lib/libdotconf.so.0 -libdata/pkgconfig/dotconf.pc -lib/libpool.a -share/aclocal/dotconf.m4 -%%PORTDOCS%%%%DOCSDIR%%/dotconf-api.txt -%%PORTDOCS%%%%DOCSDIR%%/dotconf-features.txt -%%PORTDOCS%%%%EXAMPLESDIR%%/README -%%PORTDOCS%%%%EXAMPLESDIR%%/argdouble/Makefile -%%PORTDOCS%%%%EXAMPLESDIR%%/argdouble/argdouble.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/argdouble/example_argdouble.dsp -%%PORTDOCS%%%%EXAMPLESDIR%%/argdouble/output -%%PORTDOCS%%%%EXAMPLESDIR%%/argdouble/testoutput -%%PORTDOCS%%%%EXAMPLESDIR%%/argdouble/argdouble.c -%%PORTDOCS%%%%EXAMPLESDIR%%/caseinsensitive/Makefile -%%PORTDOCS%%%%EXAMPLESDIR%%/caseinsensitive/caseinsensitive.c -%%PORTDOCS%%%%EXAMPLESDIR%%/caseinsensitive/caseinsensitive.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/caseinsensitive/example_caseinsensitive.dsp -%%PORTDOCS%%%%EXAMPLESDIR%%/context/Makefile -%%PORTDOCS%%%%EXAMPLESDIR%%/context/context.c -%%PORTDOCS%%%%EXAMPLESDIR%%/context/context.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/context/example_context.dsp -%%PORTDOCS%%%%EXAMPLESDIR%%/errorhandler/Makefile -%%PORTDOCS%%%%EXAMPLESDIR%%/errorhandler/errorhandler.c -%%PORTDOCS%%%%EXAMPLESDIR%%/errorhandler/errorhandler.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/errorhandler/example_errorhandler.dsp -%%PORTDOCS%%%%EXAMPLESDIR%%/modules/Makefile -%%PORTDOCS%%%%EXAMPLESDIR%%/modules/include.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/modules/module.c -%%PORTDOCS%%%%EXAMPLESDIR%%/modules/my_module.c -%%PORTDOCS%%%%EXAMPLESDIR%%/modules/sample.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/modules/example_modules.dsp -%%PORTDOCS%%%%EXAMPLESDIR%%/simple/Makefile -%%PORTDOCS%%%%EXAMPLESDIR%%/simple/included.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/simple/linecat.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/simple/simple.c -%%PORTDOCS%%%%EXAMPLESDIR%%/simple/simple.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/simple/example_simple.dsp -%%PORTDOCS%%%%EXAMPLESDIR%%/duplicates/Makefile -%%PORTDOCS%%%%EXAMPLESDIR%%/duplicates/duplicate.c -%%PORTDOCS%%%%EXAMPLESDIR%%/duplicates/first_module.c -%%PORTDOCS%%%%EXAMPLESDIR%%/duplicates/sample.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/duplicates/second_module.c -%%PORTDOCS%%%%EXAMPLESDIR%%/fallback/Makefile -%%PORTDOCS%%%%EXAMPLESDIR%%/fallback/fallback.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/fallback/fallback.c -%%PORTDOCS%%%%EXAMPLESDIR%%/noinline/Makefile -%%PORTDOCS%%%%EXAMPLESDIR%%/noinline/noinline.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/caseinsensitive/output -%%PORTDOCS%%%%EXAMPLESDIR%%/caseinsensitive/testoutput -%%PORTDOCS%%%%EXAMPLESDIR%%/context/output -%%PORTDOCS%%%%EXAMPLESDIR%%/context/testoutput -%%PORTDOCS%%%%EXAMPLESDIR%%/errorhandler/output -%%PORTDOCS%%%%EXAMPLESDIR%%/errorhandler/testoutput -%%PORTDOCS%%%%EXAMPLESDIR%%/modules/output -%%PORTDOCS%%%%EXAMPLESDIR%%/modules/testoutput -%%PORTDOCS%%%%EXAMPLESDIR%%/simple/output -%%PORTDOCS%%%%EXAMPLESDIR%%/simple/testoutput -%%PORTDOCS%%%%EXAMPLESDIR%%/duplicates/output -%%PORTDOCS%%%%EXAMPLESDIR%%/duplicates/testoutput -%%PORTDOCS%%%%EXAMPLESDIR%%/fallback/output -%%PORTDOCS%%%%EXAMPLESDIR%%/fallback/testoutput -%%PORTDOCS%%%%EXAMPLESDIR%%/noinline/noinline.c -%%PORTDOCS%%%%EXAMPLESDIR%%/noinline/output -%%PORTDOCS%%%%EXAMPLESDIR%%/noinline/testoutput -%%PORTDOCS%%%%EXAMPLESDIR%%/maketest.sh -%%PORTDOCS%%@dirrm share/doc/dotconf -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/argdouble -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/context -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/errorhandler -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/noinline -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/fallback -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/modules -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/simple -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/duplicates -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/caseinsensitive -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%