? packages ? archivers/gtar-base/work ? archivers/p7zip/work ? archivers/unzip/work ? bootstrap/work ? converters/p5-MIME-Base64/work ? devel/apache-ant/work ? devel/magit/work ? devel/mdds/work ? devel/p5-Capture-Tiny/work ? devel/p5-Devel-Hide/work ? devel/p5-File-pushd/work ? devel/p5-IPC-System-Simple/work ? devel/p5-Perl6-Export/work ? devel/p5-Perl6-Slurp/work ? devel/p5-Sub-Identify/work ? devel/p5-Test-FailWarnings/work ? devel/p5-Test-Fatal/work ? devel/p5-Try-Tiny/work ? devel/p5-autodie/work ? editors/texworks/work ? filesystems/p5-Path-Tiny/work ? fonts/dejavu-ttf/work ? graphics/pixmap/work ? ham/fldigi/firefox.core ? ham/fldigi/work ? ham/trustedQSL/work ? lang/clang/work ? lang/openjdk7/work ? lang/ruby/work ? mail/sendmail/work ? net/openslp/work ? net/zeromq/work ? pkgtools/pbulk/work ? pkgtools/pbulk-base/work ? print/cups/work ? print/libpaper/work ? print/poppler-data/work ? print/poppler-qt4/work ? print/poppler-utils/work ? print/teTeX3-bin/work ? security/p5-Digest-MD5/work ? security/p5-Digest-SHA/work ? textproc/makeindexk/work ? wm/fvwm/firefox.core ? wm/fvwm/ktrace.out ? x11/motif/work ? x11/qt4-libs/work ? x11/rgb/work ? x11/xf86-video-vga/work Index: devel/apel/Makefile =================================================================== RCS file: /cvs/cvsroot/pkgsrc/devel/apel/Makefile,v retrieving revision 1.31 diff -u -r1.31 Makefile --- devel/apel/Makefile 10 Mar 2013 05:10:59 -0000 1.31 +++ devel/apel/Makefile 5 Jan 2014 09:04:25 -0000 @@ -24,7 +24,7 @@ MAKE_FLAGS+= ${MAKE_FLAGS.${EMACS_FLAVOR}} # apel is included in xemacs-packages -EMACS_VERSIONS_ACCEPTED=emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox \ +EMACS_VERSIONS_ACCEPTED=emacs25 emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox \ emacs21 emacs21nox emacs20 BUILD_TARGET.emacs= elc Index: editors/emacs/modules.mk =================================================================== RCS file: /cvs/cvsroot/pkgsrc/editors/emacs/modules.mk,v retrieving revision 1.19 diff -u -r1.19 modules.mk --- editors/emacs/modules.mk 9 Oct 2013 09:52:30 -0000 1.19 +++ editors/emacs/modules.mk 5 Jan 2014 09:04:37 -0000 @@ -241,7 +241,7 @@ emacs23nox@../../editors/emacs23-nox11 \ emacs24@../../editors/emacs24 \ emacs24nox@../../editors/emacs24-nox11 \ - emacs25@../../editors/emacs-snapshot \ + emacs25@../../wip/emacs-current \ xemacs214@../../editors/xemacs \ xemacs214nox@../../editors/xemacs-nox11 \ xemacs215@../../editors/xemacs-current \ Index: ham/trustedQSL/PLIST =================================================================== RCS file: /cvs/cvsroot/pkgsrc/ham/trustedQSL/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- ham/trustedQSL/PLIST 6 Dec 2013 05:52:42 -0000 1.3 +++ ham/trustedQSL/PLIST 5 Jan 2014 09:04:58 -0000 @@ -1,4 +1,8 @@ +<<<<<<< PLIST +@comment $NetBSD$ +======= @comment $NetBSD: PLIST,v 1.3 2013/12/06 05:52:42 mef Exp $ +>>>>>>> 1.3 bin/tqsl include/adif.h include/cabrillo.h Index: misc/bbdb/Makefile =================================================================== RCS file: /cvs/cvsroot/pkgsrc/misc/bbdb/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- misc/bbdb/Makefile 6 Apr 2013 20:27:25 -0000 1.29 +++ misc/bbdb/Makefile 5 Jan 2014 09:05:17 -0000 @@ -12,7 +12,7 @@ COMMENT= Insidious Big Brother DataBase, a rolodex-like database Emacs program # bbdb is included in xemacs-packages -EMACS_VERSIONS_ACCEPTED= emacs24 emacs24nox emacs23 emacs23nox \ +EMACS_VERSIONS_ACCEPTED= emacs25 emacs24 emacs24nox emacs23 emacs23nox \ emacs22 emacs22nox emacs21 emacs21nox \ emacs20 CONFLICTS+= xemacs-packages-[0-9]* ? personal-pkgsrc/emacs-desktop/emacs-24.3.core Index: personal-pkgsrc/config-note/Makefile =================================================================== RCS file: /export/j/public-repository/personal-pkgsrc/config-note/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- personal-pkgsrc/config-note/Makefile 17 Sep 2013 01:53:57 -0000 1.1 +++ personal-pkgsrc/config-note/Makefile 5 Jan 2014 09:08:53 -0000 @@ -1,5 +1,5 @@ # $NetBSD$ -DISTNAME= config-note-0.1 +DISTNAME= config-note-0.2 CATEGORIES= meta-pkgs MAINTAINER= packages@ki.nu @@ -8,8 +8,7 @@ LICENSE= 2-clause-bsd DEPENDS+= 2vcard-[0-9]*:../../converters/2vcard -DEPENDS+= apel-[0-9]*:../../devel/apel -#DEPENDS+= avrdude-[0-9]*:../../cross/avrdude +DEPENDS+= avrdude-[0-9]*:../../cross/avrdude DEPENDS+= mdocml-[0-9]*:../../textproc/mdocml DEPENDS+= modular-xorg-[0-9]*:../../meta-pkgs/modular-xorg DEPENDS+= modular-xorg-apps-[0-9]*:../../meta-pkgs/modular-xorg-apps @@ -21,8 +20,21 @@ DEPENDS+= tcsh-[0-9]*:../../shells/tcsh DEPENDS+= xlog-[0-9]*:../../ham/xlog DEPENDS+= zsh-[0-9]*:../../shells/zsh -#DEPENDS+= xf86-video-modesetting -#DEPENDS+= sudo +DEPENDS+= dejagnu-[0-9]*:../../devel/dejagnu +DEPENDS+= emacs-desktop-[0-9]*:../../personal-pkgsrc/emacs-desktop +DEPENDS+= firefox-[0-9]*:../../www/firefox +DEPENDS+= fldigi-[0-9]*:../../wip/fldigi +#EPENDS+= flim-[0-9]*:../../devel/flim +DEPENDS+= fvwm-[0-9]*:../../wm/fvwm +DEPENDS+= nios2-binutils-[0-9]*:../../cross/nios2-binutils +DEPENDS+= pkgin-[0-9]*:../../pkgtools/pkgin +DEPENDS+= pkglint-[0-9]*:../../pkgtools/pkglint +DEPENDS+= screen-[0-9]*:../../misc/screen +#EPENDS+= semi-[0-9]*:../../devel/semi +DEPENDS+= sudo-[0-9]*:../../security/sudo +DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex +DEPENDS+= tk-[0-9]*:../../x11/tk +DEPENDS+= xf86-video-modesetting-[0-9]*:../../wip/xf86-video-modesetting META_PACKAGE= YES .include "../../mk/bsd.pkg.mk" ? wip/texlive2013 ? wip/gdb/work ? wip/libreoffice4/work ? wip/nios2-binutils/distinfo.25542 ? wip/nios2-binutils/work ? wip/nios2-gcc/tm.log ? wip/nios2-gcc/work ? wip/trustedQSL/Makefile.new Index: wip/emacs-w3m-current/PLIST =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/emacs-w3m-current/PLIST,v retrieving revision 1.9 diff -u -r1.9 PLIST --- wip/emacs-w3m-current/PLIST 4 Oct 2013 14:43:52 -0000 1.9 +++ wip/emacs-w3m-current/PLIST 5 Jan 2014 09:34:29 -0000 @@ -9,6 +9,7 @@ ${EMACS_LISPPREFIX}/w3m/mew-w3m.el ${PLIST.mew}${EMACS_LISPPREFIX}/w3m/mew-w3m.elc ${EMACS_LISPPREFIX}/w3m/mime-w3m.el +${EMACS_LISPPREFIX}/w3m/w3m-load.elc ${EMACS_LISPPREFIX}/w3m/mime-w3m.elc ${EMACS_LISPPREFIX}/w3m/nnshimbun.el ${EMACS_LISPPREFIX}/w3m/nnshimbun.elc Index: wip/mk/git-package.mk =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/mk/git-package.mk,v retrieving revision 1.15 diff -u -r1.15 git-package.mk --- wip/mk/git-package.mk 9 Sep 2013 14:05:31 -0000 1.15 +++ wip/mk/git-package.mk 5 Jan 2014 09:34:30 -0000 @@ -64,7 +64,7 @@ _GIT_CMD= git _GIT_ENV= # empty -_GIT_FLAGS= --quiet --depth 1 +_GIT_FLAGS?= --quiet --depth 1 _GIT_TODAY_CMD= ${DATE} -u +'%Y-%m-%d' _GIT_TODAY= ${_GIT_TODAY_CMD:sh} _GIT_PKGVERSION_CMD= ${DATE} -u +'%Y.%m.%d' Index: wip/nios2/Makefile.common =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/nios2/Makefile.common,v retrieving revision 1.5 diff -u -r1.5 Makefile.common --- wip/nios2/Makefile.common 16 Nov 2013 13:30:11 -0000 1.5 +++ wip/nios2/Makefile.common 5 Jan 2014 09:34:30 -0000 @@ -6,11 +6,18 @@ # sentinel to avoid duplicate .if !defined(NIOS2_MAKEFILECOMMON) NIOS2_MAKEFILECOMMON= # yes +<<<<<<< Makefile.common + +MASTER_SITES= ftp://ftp.altera.com/outgoing/download/support/ip/processors/nios2/gnu/ +DISTNAME= nios2_gnu_gcc4_13.0 +EXTRACT_SUFX= .gz +======= DISTNAME= sourceryg++-2013.05-43-nios2-linux-gnu.src CATEGORIES= cross MASTER_SITES= https://sourcery.mentor.com/GNUToolchain/package11649/public/nios2-linux-gnu/ EXTRACT_SUFX= .tar.bz2 FETCH_USING= curl +>>>>>>> 1.5 GNU_CONFIGURE= yes INFO_FILES= #empty Index: wip/nios2-binutils/Makefile =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/nios2-binutils/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- wip/nios2-binutils/Makefile 6 Dec 2013 01:06:15 -0000 1.12 +++ wip/nios2-binutils/Makefile 5 Jan 2014 09:34:30 -0000 @@ -11,7 +11,12 @@ COMMENT= GNU binutils for Altera FPGA Nios2 processor LICENSE= gnu-gpl-v3 +<<<<<<< Makefile +EXTRACT_ELEMENTS= binutils-${PKGVERSION} +WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS} +======= BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo +>>>>>>> 1.12 # No need to use makeinfo - this package doesn't install the documentation. USE_TOOLS+= gmake @@ -21,6 +26,23 @@ USE_GNU_CONFIGURE_HOST= no INFO_FILES= # empty +<<<<<<< Makefile +.include "../../wip/nios2/Makefile.common" + +CONFIGURE_ARGS+= --disable-nls +# install libiberty by architecture +CONFIGURE_ARGS+= --libdir=${PREFIX}/${NIOS2_TARGET}/lib + +# To avoid conflict with other cross/native info files, +NIOS_INFO_DIR= ${PREFIX}/info/${NIOS2_TARGET} +.include "../../mk/bsd.prefs.mk" +INFO_DIR?= ${NIOS_INFO_DIR} + +# CONFIGURE_ARGS+= --infodir= +# doesn't make it, will be overridden by following variables +# see mk/configure/gnu-configure.mk +GNU_CONFIGURE_INFODIR= ${NIOS_INFO_DIR} +======= NIOS2_TARGET= nios2-elf CONFIGURE_ARGS+= --disable-werror --target=${NIOS2_TARGET} --disable-nls PLIST_SUBST+= NIOS2_TARGET=${NIOS2_TARGET:Q} @@ -38,6 +60,10 @@ gas/doc/as.1; do \ ${TOUCH} $${f}; \ done +>>>>>>> 1.12 + +do-extract: + (cd ${WRKDIR}; tar zxf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${EXTRACT_ELEMENTS} ) # following file installed is reference only, not used at all for the moment post-install: Index: wip/nios2-binutils/distinfo =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/nios2-binutils/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- wip/nios2-binutils/distinfo 6 Dec 2013 01:06:15 -0000 1.6 +++ wip/nios2-binutils/distinfo 5 Jan 2014 09:34:30 -0000 @@ -1,5 +1,10 @@ $NetBSD: distinfo,v 1.5 2009/08/27 15:26:41 hasso Exp $ +<<<<<<< distinfo +SHA1 (nios2_gnu_gcc4_13.0.gz) = 1df8e0ebd1f0e42ab4dd8a507c0a3dc85c1d598b +RMD160 (nios2_gnu_gcc4_13.0.gz) = 5331366fc1ab307909bbe6a2ef1fc11d70b0f523 +Size (nios2_gnu_gcc4_13.0.gz) = 110799088 bytes +======= SHA1 (binutils-2.24.tar.bz2) = 7ac75404ddb3c4910c7594b51ddfc76d4693debb RMD160 (binutils-2.24.tar.bz2) = b4aa3ea5ba9d0d9f817b2cf136e7f911f692af8d Size (binutils-2.24.tar.bz2) = 22716802 bytes @@ -11,3 +16,4 @@ SHA1 (patch-ah) = b6e91279475c41bc78b3df227938a91948fc377c SHA1 (patch-ai) = 3cd298ac0364f913c1261fc87f7f474281bae9cf SHA1 (patch-aj) = fd2a66979f68350a53960defdaf5e9e5018ec59a +>>>>>>> 1.6 Index: wip/nios2-gcc/Makefile =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/nios2-gcc/Attic/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- wip/nios2-gcc/Makefile 3 Nov 2013 11:10:18 -0000 1.7 +++ wip/nios2-gcc/Makefile 5 Jan 2014 09:34:30 -0000 @@ -9,17 +9,20 @@ COMMENT= GNU gcc for Altera FPGA Nios2 processor LICENSE= gnu-gpl-v2 -BROKEN= 'Segmentation Fault at build, see TODO, tks.' +#BROKEN= 'Segmentation Fault at build, see TODO, tks.' +NOT_FOR_PLATFORM= *-*-x86_64 + EXTRACT_ELEMENTS= gcc-${PKG_VERSION} WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS} PATH:= ${CROSSBASE}/bin:${PATH} -USE_TOOLS+= gmake makeinfo perl +USE_TOOLS+= gmake makeinfo perl tar USE_GNU_CONFIGURE_HOST= no #BUILD_DEFS+= CROSSBASE #included in ../nios2/Makefile.common EXTRACT_SUFX= .gz DEPENDS+= nios2-binutils-[0-9]*:../../wip/nios2-binutils +BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex .include "../../wip/nios2/Makefile.common" @@ -27,23 +30,24 @@ CONFIGURE_ARGS+= --disable-multilib CONFIGURE_ARGS+= --disable-threads CONFIGURE_ARGS+= --disable-nls +CONFIGURE_ARGS+= --disable-libssp +CONFIGURE_ARGS+= --disable-doc # to avoid strange problem due to long `uname -a` result CONFIGURE_ARGS+= --host=${MACHINE_ARCH}--${LOWER_OPSYS} CONFIGURE_ARGS+= --build=${MACHINE_ARCH}--${LOWER_OPSYS} CFLAGS+= -g +# $PREFIX has CROSSBASE +MAKE_ENV+= TEX=${PREFIX}/../bin/pdftex INFO_FILES= no -#.include "../../devel/gmp/buildlink3.mk" # 4.4 or later -#.include "../../math/mpfr/buildlink3.mk" # 4.4 or later - do-extract: (cd ${WRKDIR}; tar zxf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${EXTRACT_ELEMENTS} ) # to avoid conflict with binutils (to be fixed by more sophisticated way) post-install: ${RM} ${DESTDIR}${CROSSBASE}/lib/libiberty.a -# to avoid conflict wit mingw-w64-gcc-4.5.1 +# to avoid conflict wit mingw-w64-gcc-4.5.1 ${RM} ${DESTDIR}${CROSSBASE}/man/man7/fsf-funding.7 ${RM} ${DESTDIR}${CROSSBASE}/man/man7/gfdl.7 ${RM} ${DESTDIR}${CROSSBASE}/man/man7/gpl.7 @@ -53,4 +57,8 @@ ${RM} ${DESTDIR}${CROSSBASE}/info/gccinstall.info ${RM} ${DESTDIR}${CROSSBASE}/info/gccint.info +#.include "../../devel/gmp/buildlink3.mk" # 4.4 or later +#.include "../../math/mpfr/buildlink3.mk" # 4.4 or later +.include "../../print/teTeX3-bin/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" Index: wip/nios2-gcc/distinfo =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/nios2-gcc/Attic/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- wip/nios2-gcc/distinfo 3 Nov 2013 11:10:18 -0000 1.3 +++ wip/nios2-gcc/distinfo 5 Jan 2014 09:34:30 -0000 @@ -3,5 +3,5 @@ SHA1 (nios2_gnu_gcc4_13.0.gz) = 1df8e0ebd1f0e42ab4dd8a507c0a3dc85c1d598b RMD160 (nios2_gnu_gcc4_13.0.gz) = 5331366fc1ab307909bbe6a2ef1fc11d70b0f523 Size (nios2_gnu_gcc4_13.0.gz) = 110799088 bytes -SHA1 (patch-aa) = 523c37419fdef29355624c7d1a38e5cd61cef194 -SHA1 (patch-libjava_classpath_scripts_loc) = cb0c2e1b5e8cd3f213c4ecc6536df5587b61dc45 +SHA1 (patch-aa) = 6a8e5650cad8bab45428b9a848275551620f8961 +SHA1 (patch-libjava_classpath_script_loc) = 039d83c8dcb19f07a684edfe860ec687a50e636b Index: wip/nios2-gcc/patches/patch-aa =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/nios2-gcc/patches/Attic/patch-aa,v retrieving revision 1.2 diff -u -r1.2 patch-aa --- wip/nios2-gcc/patches/patch-aa 3 Nov 2013 11:10:18 -0000 1.2 +++ wip/nios2-gcc/patches/patch-aa 5 Jan 2014 09:34:30 -0000 @@ -8,7 +8,16 @@ # _si_to_df.o _si_to_sf.o --- gcc/Makefile.in.orig 2013-06-14 06:32:52.000000000 +0900 -+++ gcc/Makefile.in 2013-10-22 18:50:44.000000000 +0900 ++++ gcc/Makefile.in 2013-11-08 14:27:06.000000000 +0900 +@@ -487,7 +487,7 @@ infodir = @infodir@ + cpp_install_dir = @cpp_install_dir@ + # where the locale files go + datadir = @datadir@ +-localedir = $(datadir)/locale ++localedir = /usr/pkg/cross/share/locale + # Extension (if any) to put in installed man-page filename. + man1ext = .1 + man7ext = .7 @@ -1062,15 +1062,15 @@ LIBGCOV = _gcov _gcov_merge_add _gcov_me _gcov_execv _gcov_execvp _gcov_execve \ _gcov_interval_profiler _gcov_pow2_profiler _gcov_one_value_profiler @@ -31,3 +40,49 @@ TPBIT_FUNCS = _pack_tf _unpack_tf _addsub_tf _mul_tf _div_tf \ _fpcmp_parts_tf _compare_tf _eq_tf _ne_tf _gt_tf _ge_tf \ +@@ -3369,37 +3369,20 @@ stmp-install-fixproto: fixproto + # + # Remake the info files. + +-doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug ++doc: + + INFOFILES = doc/cpp.info doc/gcc.info doc/gccint.info \ + doc/gccinstall.info doc/cppinternals.info + +-info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo ++info: + +-srcinfo: $(INFOFILES) +- -cp -p $^ $(srcdir)/doc +- +-TEXI_CPP_FILES = cpp.texi fdl.texi cppenv.texi cppopts.texi \ +- gcc-common.texi gcc-vers.texi +- +-TEXI_GCC_FILES = gcc.texi gcc-common.texi gcc-vers.texi frontends.texi \ +- standards.texi invoke.texi extend.texi md.texi objc.texi \ +- gcov.texi trouble.texi bugreport.texi service.texi \ +- contribute.texi compat.texi funding.texi gnu.texi gpl.texi \ +- fdl.texi contrib.texi cppenv.texi cppopts.texi \ +- implement-c.texi arm-neon-intrinsics.texi +- +-TEXI_GCCINT_FILES = gccint.texi gcc-common.texi gcc-vers.texi \ +- contribute.texi makefile.texi configterms.texi options.texi \ +- portability.texi interface.texi passes.texi c-tree.texi \ +- rtl.texi md.texi tm.texi hostconfig.texi fragments.texi \ +- configfiles.texi collect2.texi headerdirs.texi funding.texi \ +- gnu.texi gpl.texi fdl.texi contrib.texi languages.texi \ +- sourcebuild.texi gty.texi libgcc.texi cfg.texi tree-ssa.texi +- +-TEXI_GCCINSTALL_FILES = install.texi install-old.texi fdl.texi ++srcinfo: + +-TEXI_CPPINT_FILES = cppinternals.texi gcc-common.texi gcc-vers.texi ++TEXI_CPP_FILES = ++TEXI_GCC_FILES = ++TEXI_GCCINT_FILES = ++TEXI_GCCINSTALL_FILES = ++TEXI_CPPINT_FILES = + + # gcc-vers.texi is generated from the version files. + gcc-vers.texi: $(BASEVER) $(DEVPHASE) Index: wip/tamago-anthy/Makefile =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/tamago-anthy/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- wip/tamago-anthy/Makefile 12 Feb 2013 14:35:43 -0000 1.10 +++ wip/tamago-anthy/Makefile 5 Jan 2014 09:34:32 -0000 @@ -32,7 +32,7 @@ GIT_REPOSITORIES= master GIT_MODULE.master= egg GIT_REPO.master= git://git.debian.org/git/pkg-anthy/egg.git -_GIT_FLAGS?= --depth 1 +_GIT_FLAGS= # empty (no --depth 1) GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/egg Index: wip/trustedQSL/Makefile =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/trustedQSL/Makefile,v retrieving revision 1.39 diff -u -r1.39 Makefile --- wip/trustedQSL/Makefile 4 Dec 2013 01:07:15 -0000 1.39 +++ wip/trustedQSL/Makefile 5 Jan 2014 09:34:32 -0000 @@ -1,19 +1,32 @@ # $NetBSD: Makefile,v 1.4 2013/09/24 11:16:04 mef Exp $ DISTNAME= tqsl-2.0 +<<<<<<< Makefile +PKGNAME= ${DISTNAME}rc6 +======= +>>>>>>> 1.39 CATEGORIES= ham +<<<<<<< Makefile +MASTER_SITES= http://www.arrl.org/files/file/LoTW%20Instructions/ +MASTER_SITES= http://downloads.sourceforge.net/project/trustedqsl/TrustedQSL/v2.0-rc6/ +======= MASTER_SITES= http://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v2.0/ EXTRACT_SUFX= .tgz +>>>>>>> 1.39 MAINTAINER= makoto@ki.nu HOMEPAGE= http://sourceforge.net/projects/trustedqsl/ COMMENT= TrustedQSL, uploading QSL Data to LoTW of ARRL +<<<<<<< Makefile +LICENSE= arrl-license +======= LICENSE= arrl-license # A macro _S in /usr/include/ctype.h conflicts with one in apps/tqsltrace.h # NOT_FOR_PLATFORM+= NetBSD-5.* DEPENDS+= mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts +>>>>>>> 1.39 USE_TOOLS+= perl gmake cmake USE_LANGUAGES+= c c++ @@ -62,7 +75,9 @@ ) .include "../../textproc/expat/buildlink3.mk" .include "../../databases/db5/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" .include "../../x11/wxGTK28/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" + Index: wip/trustedQSL/PLIST =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/trustedQSL/PLIST,v retrieving revision 1.8 diff -u -r1.8 PLIST --- wip/trustedQSL/PLIST 30 Sep 2013 02:20:25 -0000 1.8 +++ wip/trustedQSL/PLIST 5 Jan 2014 09:34:32 -0000 @@ -1,4 +1,4 @@ -@comment $NetBSD$ +@comment $NetBSD: PLIST,v 1.1 2013/09/13 08:45:52 mef Exp $ bin/tqsl include/adif.h include/cabrillo.h Index: wip/trustedQSL/distinfo =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/trustedQSL/distinfo,v retrieving revision 1.20 diff -u -r1.20 distinfo --- wip/trustedQSL/distinfo 4 Dec 2013 01:07:15 -0000 1.20 +++ wip/trustedQSL/distinfo 5 Jan 2014 09:34:32 -0000 @@ -1,8 +1,16 @@ $NetBSD: distinfo,v 1.3 2013/09/24 11:16:04 mef Exp $ +<<<<<<< distinfo +SHA1 (tqsl-2.0rc6/tqsl-2.0.tar.gz) = a06deeaa8b55dec41085ab89d9558d85cbf8f91a +RMD160 (tqsl-2.0rc6/tqsl-2.0.tar.gz) = 3754a8372f2e20d494711b64bcac23f9fa1b5e2a +Size (tqsl-2.0rc6/tqsl-2.0.tar.gz) = 2621151 bytes +SHA1 (patch-apps_CMakeLists.txt) = 6057dd58f9297b5f23158e5a959564c864d46147 +SHA1 (patch-apps_tqsl_cpp) = 93ba43c8ad0955d77b47622ac722765ba146586b +======= SHA1 (tqsl-2.0.tgz) = c132d83bb7bd2e805fe9d6df52ea235d55153153 RMD160 (tqsl-2.0.tgz) = 7f3e3af2336e43851fb419484e7cfea0ec0089e0 Size (tqsl-2.0.tgz) = 2626483 bytes SHA1 (patch-apps_CMakeLists.txt) = 6057dd58f9297b5f23158e5a959564c864d46147 SHA1 (patch-apps_tqsl_cpp) = 7fb5072ee21ef5a04bed40f51ef7dea0b25ec217 +>>>>>>> 1.20 SHA1 (patch-src_tqslconvert_cpp) = 6a0a4e54c1f351a0bd8e0e6f8c04a87ea975330e