Index: head/databases/firebird25-server/Makefile =================================================================== --- head/databases/firebird25-server/Makefile (revision 417348) +++ head/databases/firebird25-server/Makefile (revision 417349) @@ -1,217 +1,217 @@ # Created by: Alonso Cárdenas Márquez # $FreeBSD$ PORTNAME= firebird PORTVERSION= 2.5.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= databases MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.0//}-Release/ PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.26856-0 DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT?= Firebird-2 relational database (server) LICENSE= IDPL IPL LICENSE_COMB= multi LICENSE_NAME_IDPL= Initial Developer's Public License LICENSE_NAME_IPL= InterBase Public License LICENSE_FILE_IDPL= ${WRKSRC}/builds/install/misc/IDPLicense.txt LICENSE_FILE_IPL= ${WRKSRC}/builds/install/misc/IPLicense.txt LICENSE_PERMS_IDPL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_IPL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libicuuc.so:devel/icu USES= gmake pkgconfig tar:bzip2 GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS= --with-system-icu \ --prefix=${LOCALSTATEDIR} \ --exec-prefix=${PREFIX} \ --with-fbconf=${PREFIX}/${CONFDIR} \ --with-fbglock=${LOCALSTATEDIR} \ --with-fbhelp=${LOCALSTATEDIR}/help \ --with-fbintl=${LIBEXECDIR}/intl \ --with-fblog=${LOCALSTATEDIR} \ --with-fbmsg=${DATADIR} \ --with-fbplugins=${LIBEXECDIR}/plugins \ --with-fbsbin=${PREFIX}/sbin \ --with-fbsecure-db=${LOCALSTATEDIR} \ --with-fbudf=${LIBEXECDIR}/UDF CONFIGURE_ENV+= PTHREAD_LIBS="-lpthread" \ ac_cv_header_atomic_ops_h="no" \ ac_cv_lib_atomic_ops_main="no" LOCALSTATEDIR= /var/db/firebird CONFDIR= etc/firebird LIBEXECDIR= ${PREFIX}/libexec/firebird PLIST_SUB= FIREBIRD_VERSION=${PORTVERSION} \ LOCALSTATEDIR="var/db/firebird" CONFDIR="${CONFDIR}" # Don't use ld for linking, use gcc LD= ${CC} # Don't strip binary files STRIP= ONLY_FOR_ARCHS= i386 amd64 CONFLICTS+= firebird-client-2.0* firebird-server-2.0* \ firebird-client-2.1* firebird-server-2.1* INSTALL_FB= ${INSTALL} ${COPY} IPCRM_CMD= /usr/bin/ipcrm IPCS_CMD= /usr/bin/ipcs IPCCHECK!= ${IPCRM_CMD} -q 0 2>&1 || true .if ${IPCCHECK:Mimplemented} IGNORE= your system does not support sysvipc .endif .if !defined(CLIENT_ONLY) # Server part stuff USES+= firebird CONFIGURE_ARGS+=--enable-superserver --without-editline ALL_TARGET= firebird_embedded firebird_server USE_RC_SUBR= firebird SUB_FILES= pkg-message UTIL_SBIN= fb_inet_server fb_lock_print fb_smp_server fbserver UTIL_BIN= fbguard fbsplit fbstat fbsvcmgr fbtracemgr gbak gdef gfix gsec \ nbackup UDF_SO= ib_udf.so fbudf.so UDF_SQL= src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql PKGINSTALL?= ${PKGDIR}/pkg-install-server .else # Client part stuff LIB_DEPENDS+= libedit.so.0:devel/libedit LDFLAGS+= -L${LOCALBASE}/lib # to link in lncurses pulled in by libedit CONFIGURE_ARGS+= --with-system-editline CONFIGURE_ENV+= ac_cv_lib_edit_readline="yes" ALL_TARGET= firebird_basic libfbembed libfbclient embed_isql embed_gpre \ embed_gdef embed_qli extlib USE_LDCONFIG= yes CLIENT_BIN= gpre isql-fb qli OPTIONS_DEFINE= DOCS DOCS_PORTDOCS= * FB_DOCS_FILES= WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \ ods11-index-structure.html FB_DOCS_DIRS= sql.extensions license upgrade .endif MAKE_ENV+= FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}" MAKE_ARGS+= PREFIX="${STAGEDIR}${PREFIX}" post-patch: ${FIND} ${WRKSRC} -name "*.sh" -exec ${CHMOD} +x {} \+ ${REINPLACE_CMD} -e \ 's|/isql|/isql-fb|g' -e \ 's|/gstat|/fbstat|g' -e \ 's|/gsplit|/fbsplit|g' ${WRKSRC}/builds/posix/make.defaults .include .if ${ARCH} == "amd64" CFLAGS+= -DAMD64 .endif .if !defined(CLIENT_ONLY) USERS= ${PORTNAME} GROUPS= ${USERS} .endif .ifndef WITHOUT_IPC_CLEANUP pre-build: .if !defined(CLIENT_ONLY) @${SETENV} PKG_PREFIX="${STAGEDIR}${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif ${MAKE} -C ${WRKSRC}/extern/btyacc [ -f ${WRKDIR}/ipcs.pre.build ] || ${IPCS_CMD} -s | ${TAIL} -n +3 | \ ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.pre.build post-build: ${IPCS_CMD} -s | ${TAIL} -n +3 | ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.post.build ${DIFF} -n ${WRKDIR}/ipcs.pre.build ${WRKDIR}/ipcs.post.build | \ ${TAIL} -n +2 | ${SED} -E 's/^s +([0-9]+).*$$/\/usr\/bin\/ipcrm -s \1/' > ${WRKDIR}/ipcrm.sh ${SH} ${WRKDIR}/ipcrm.sh .endif do-install: .if !defined(CLIENT_ONLY) ${INSTALL_PROGRAM} ${UTIL_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${UTIL_SBIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/sbin @${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR} ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/aliases.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/aliases.conf.sample ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/fbtrace.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/fbtrace.conf ${MKDIR} ${STAGEDIR}${LIBEXECDIR}/udf ${STAGEDIR}${LOCALSTATEDIR}/help ${STAGEDIR}${LIBEXECDIR}/intl \ ${STAGEDIR}${LIBEXECDIR}/plugins ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/fbintl.conf ${STAGEDIR}${LIBEXECDIR}/intl/fbintl.conf ${INSTALL_FB} -m 0555 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${STAGEDIR}${LIBEXECDIR}/udf ${INSTALL_FB} -m 0444 ${UDF_SQL:S!^!${WRKSRC}/!} ${STAGEDIR}${LIBEXECDIR}/udf ${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/plugins/libfbtrace.so ${STAGEDIR}${LIBEXECDIR}/plugins ${INSTALL_FB} -m 0660 ${WRKSRC}/gen/firebird/security2.fdb ${STAGEDIR}${LOCALSTATEDIR}/security2.fdb.sample ${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb ${STAGEDIR}${LOCALSTATEDIR}/help ${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${STAGEDIR}${LIBEXECDIR}/intl/fbintl.so .else # defined CLIENT_ONLY ${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${WRKSRC}/gen/install/misc/firebird.conf > ${WRKDIR}/firebird.conf @${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR} ${INSTALL_DATA} ${WRKDIR}/firebird.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/firebird.conf.sample ${INSTALL_DATA} ${WRKSRC}/gen/firebird/lib/libib_util.so \ ${WRKSRC}/gen/firebird/lib/libfbclient.so.${PORTVERSION} \ ${WRKSRC}/gen/firebird/lib/libfbembed.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.2.5 ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.2 ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so.2.5 ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so.2 ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so.2.5 ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so.2 ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so @${MKDIR} ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${STAGEDIR}${PREFIX}/include @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${STAGEDIR}${DATADIR} post-install-DOCS-on: @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}" @${MKDIR} ${FB_DOCS_DIRS:S!^!${STAGEDIR}${DOCSDIR}/!} ${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${STAGEDIR}${DOCSDIR} - ${LN} -sf ${DOCSDIR}/README.user ${STAGEDIR}${DOCSDIR}/README + ${LN} -sf README.user ${STAGEDIR}${DOCSDIR}/README ${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/* ${STAGEDIR}${DOCSDIR}/sql.extensions ${INSTALL_DATA} ${WRKSRC}/doc/license/* ${STAGEDIR}${DOCSDIR}/license ${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v2/* ${STAGEDIR}${DOCSDIR}/upgrade .endif .include Index: head/deskutils/anamnesis/Makefile =================================================================== --- head/deskutils/anamnesis/Makefile (revision 417348) +++ head/deskutils/anamnesis/Makefile (revision 417349) @@ -1,48 +1,49 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= anamnesis PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= SF MAINTAINER= yuri@rawbw.com COMMENT= Clipboard manager that stores all clipboard history LICENSE= GPLv3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2 \ ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg USES= python PORTDOCS= ChangeLog README OPTIONS_DEFINE= DOCS NO_ARCH= yes post-patch: @${REINPLACE_CMD} 's|cfg_files.reverse()|cfg_files += [os.path.join("'${PREFIX}/etc/'",cfg_filename)]; cfg_files.reverse()|' \ ${WRKSRC}/source/config.py do-build: @(cd ${WRKSRC} && \ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${WRKSRC} -f ${WRKSRC} && \ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${WRKSRC} -f ${WRKSRC}) do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/anamnesis .for f in anamnesis browser config clipboard clipboard_gtk clipboard_gtk_xclip daemon db db_sqlite3fts ${INSTALL_DATA} ${WRKSRC}/source/${f}.py ${STAGEDIR}${PREFIX}/share/anamnesis ${INSTALL_DATA} ${WRKSRC}/source/${f}.pyc ${STAGEDIR}${PREFIX}/share/anamnesis ${INSTALL_DATA} ${WRKSRC}/source/${f}.pyo ${STAGEDIR}${PREFIX}/share/anamnesis .endfor - ${LN} -sf ${PREFIX}/share/anamnesis/anamnesis.py ${STAGEDIR}${PREFIX}/bin/anamnesis + ${LN} -sf ../share/anamnesis/anamnesis.py ${STAGEDIR}${PREFIX}/bin/anamnesis ${INSTALL_DATA} ${WRKSRC}/anamnesis.cfg ${STAGEDIR}${PREFIX}/etc/anamnesis.cfg.sample ${INSTALL_MAN} ${WRKSRC}/man/anamnesis.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Index: head/deskutils/ganttproject/Makefile =================================================================== --- head/deskutils/ganttproject/Makefile (revision 417348) +++ head/deskutils/ganttproject/Makefile (revision 417349) @@ -1,38 +1,39 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= ganttproject PORTVERSION= 2.7.1 +PORTREVISION= 1 DISTVERSIONSUFFIX= -r1924 CATEGORIES= deskutils java MASTER_SITES= https://dl.ganttproject.biz/${PORTNAME}-${PORTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= Gantt chart based project scheduling and management tool LICENSE= GPLv3 NO_ARCH= yes NO_BUILD= yes USES= shebangfix zip SHEBANG_FILES= ganttproject bash_CMD= ${SH} USE_JAVA= yes JAVA_VERSION= 1.6+ INSTALLS_ICONS= yes DESKTOP_ENTRIES="GanttProject" "" "ganttproject" "ganttproject" "" "" do-install: @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) ${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/ganttproject - ${LN} -sf ${DATADIR}/ganttproject ${STAGEDIR}${PREFIX}/bin + ${LN} -sf ../${DATADIR_REL}/ganttproject ${STAGEDIR}${PREFIX}/bin .for i in 16 24 32 48 64 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps - ${LN} -sf ${DATADIR}/plugins/net.sourceforge.ganttproject/data/resources/logos/icon${i}.png \ + ${LN} -sf ../../../../../${DATADIR_REL}/plugins/net.sourceforge.ganttproject/data/resources/logos/icon${i}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/ganttproject.png .endfor .include Index: head/deskutils/remind/Makefile =================================================================== --- head/deskutils/remind/Makefile (revision 417348) +++ head/deskutils/remind/Makefile (revision 417349) @@ -1,82 +1,83 @@ # Created by: Lewis Thompson # $FreeBSD$ PORTNAME= remind PORTVERSION= 3.1.15 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://www.roaringpenguin.com/files/download/ \ http://freebsd.unixfreunde.de/sources/ DISTNAME= ${PORTNAME}-03.01.15 MAINTAINER= jadawin@FreeBSD.org COMMENT= Sophisticated calendar and alarm program LICENSE= GPLv2 OPTIONS_DEFINE= TCLTK GNU_CONFIGURE= yes MAKE_ARGS= INSTALL_SCRIPT="${INSTALL_SCRIPT}" PLIST_FILES= bin/rem \ bin/rem2ps \ bin/remind \ man/man1/rem.1.gz \ man/man1/rem2ps.1.gz \ man/man1/remind.1.gz .include .if ${PORT_OPTIONS:MTCLTK} USES= tk RUN_DEPENDS+= dtplite:devel/tcllib PLIST_FILES+= bin/cm2rem.tcl bin/tkremind .endif post-patch: # This seems more than a little ugly. .if defined(LAT_DEG) @${REINPLACE_CMD} -e 's#LAT_DEG 45#LAT_DEG ${LAT_DEG}#' ${WRKSRC}/src/custom.h .endif .if defined(LAT_MIN) @${REINPLACE_CMD} -e 's#LAT_MIN 24#LAT_MIN ${LAT_MIN}#' ${WRKSRC}/src/custom.h .endif .if defined(LAT_SEC) @${REINPLACE_CMD} -e 's#LAT_SEC 0#LAT_SEC ${LAT_SEC}#' ${WRKSRC}/src/custom.h .endif .if defined(LON_DEG) @${REINPLACE_CMD} -e 's#LON_DEG 75#LON_DEG ${LON_DEG}#' ${WRKSRC}/src/custom.h .endif .if defined(LON_MIN) @${REINPLACE_CMD} -e 's#LON_MIN 39#LON_MIN ${LON_MIN}#' ${WRKSRC}/src/custom.h .endif .if defined(LON_SEC) @${REINPLACE_CMD} -e 's#LON_SEC 0#LON_SEC ${LON_SEC}#' ${WRKSRC}/src/custom.h .endif .if defined(LOCATION) @${REINPLACE_CMD} -e 's#Ottawa#${LOCATION}#' ${WRKSRC}/src/custom.h .endif .if defined(A4) @${REINPLACE_CMD} -e 's#"Letter", 612, 792#"A4", 595, 842#' ${WRKSRC}/src/custom.h .endif .if ${PORT_OPTIONS:MTCLTK} @${REINPLACE_CMD} -e 's,wish,${WISH},' ${WRKSRC}/scripts/tkremind @${REINPLACE_CMD} -e 's,tclsh,${TCLSH},' ${WRKSRC}/scripts/cm2rem.tcl .endif do-install: .for i in rem2ps remind ${INSTALL_PROGRAM} ${WRKSRC}/src/${i} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/${i}.1 ${STAGEDIR}${PREFIX}/man/man1 .endfor ${INSTALL_MAN} ${WRKSRC}/man/rem.1 ${STAGEDIR}${PREFIX}/man/man1 - ${LN} -sf ${PREFIX}/bin/remind ${STAGEDIR}${PREFIX}/bin/rem + ${LN} -sf ../bin/remind ${STAGEDIR}${PREFIX}/bin/rem .if ${PORT_OPTIONS:MTCLTK} ${INSTALL_SCRIPT} ${WRKSRC}/scripts/cm2rem.tcl ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/scripts/tkremind ${STAGEDIR}${PREFIX}/bin .for i in cm2rem tkremind ${INSTALL_MAN} ${WRKSRC}/man/${i}.1 ${STAGEDIR}${PREFIX}/man/man1 .endfor .endif .include Index: head/deskutils/tel/Makefile =================================================================== --- head/deskutils/tel/Makefile (revision 417348) +++ head/deskutils/tel/Makefile (revision 417349) @@ -1,35 +1,35 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= tel PORTVERSION= 0.1.7.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}.berlios MAINTAINER= ports@FreeBSD.org COMMENT= Little console-based phone book manager LICENSE= MIT NO_ARCH= yes USES= gettext python shebangfix tar:bzip2 SHEBANG_FILES= src/tel.py USE_PYTHON= distutils post-patch: @${REINPLACE_CMD} -e \ 's|distutils\.command\.install |setuptools\.command\.install |' \ ${WRKSRC}/appdistutils.py @${REINPLACE_CMD} -e \ 's|$${install_messages}|${PREFIX}/share/locale| ; \ s|$${install_app_modules}|${PREFIX}/lib/tel| ; \ s|$${install_app_data}|${DATADIR}|' \ ${WRKSRC}/src/tel.py post-install: @${FIND} ${STAGEDIR}${PREFIX}/bin -type l -delete - @${LN} -sf ${PREFIX}/lib/tel/tel.py ${STAGEDIR}${PREFIX}/bin/tel + @${LN} -sf ../lib/tel/tel.py ${STAGEDIR}${PREFIX}/bin/tel .include