aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/icoconvert/Makefile9
-rw-r--r--net-im/py-jabber/Makefile9
-rw-r--r--net-im/py-jabber/pkg-plist11
-rw-r--r--net-p2p/bnbt/Makefile40
-rw-r--r--net-p2p/bnbt/pkg-plist6
-rw-r--r--net/grdesktop/Makefile9
-rw-r--r--net/grdesktop/pkg-plist1
-rw-r--r--net/ldapsh/Makefile18
-rw-r--r--net/ldapsh/pkg-plist5
-rw-r--r--sysutils/testdisk/Makefile54
-rw-r--r--sysutils/testdisk/distinfo4
11 files changed, 63 insertions, 103 deletions
diff --git a/graphics/icoconvert/Makefile b/graphics/icoconvert/Makefile
index 4760517cf09b..2324e27cf4de 100644
--- a/graphics/icoconvert/Makefile
+++ b/graphics/icoconvert/Makefile
@@ -9,18 +9,19 @@ MASTER_SITES= http://www.mox.net/downloads/ \
http://www.xunix.org/~flz/distfiles/
MAINTAINER= flz@FreeBSD.org
-COMMENT= A small utility to convert Windows icon files into .xpm and .png files
+COMMENT= Small utility to convert Windows icon files into .xpm and .png files
-LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd
+LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd
+
+MAKE_ARGS= CC="${CC}"
PLIST_FILES= bin/icoconvert
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's|^icoconvert|all|' -e 's|^\(FLAGS=\)|\1-I${LOCALBASE}/include |' \
-e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/Makefile
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/icoconvert ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/icoconvert ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>
diff --git a/net-im/py-jabber/Makefile b/net-im/py-jabber/Makefile
index c08914232652..9d0d3fe4f6a1 100644
--- a/net-im/py-jabber/Makefile
+++ b/net-im/py-jabber/Makefile
@@ -9,15 +9,14 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= jabberpy-${PORTVERSION}-0
MAINTAINER= flz@FreeBSD.org
-COMMENT= A Python Jabber library
+COMMENT= Python Jabber library
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-PYDISTUTILS_PKGNAME= jabber.py
-PYDISTUTILS_PKGVERSION= 0.3-1
+PYDISTUTILS_AUTOPLIST= yes
+PLIST_FILES= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/jabber.pth
-NO_STAGE= yes
post-install:
- @${ECHO} "jabber" > ${PYTHON_SITELIBDIR}/jabber.pth
+ @${ECHO} "jabber" > ${STAGEDIR}${PYTHON_SITELIBDIR}/jabber.pth
.include <bsd.port.mk>
diff --git a/net-im/py-jabber/pkg-plist b/net-im/py-jabber/pkg-plist
deleted file mode 100644
index f1673e11b430..000000000000
--- a/net-im/py-jabber/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-%%PYTHON_SITELIBDIR%%/jabber.pth
-%%PYTHON_SITELIBDIR%%/jabber/debug.py
-%%PYTHON_SITELIBDIR%%/jabber/debug.pyc
-%%PYTHON_SITELIBDIR%%/jabber/debug.pyo
-%%PYTHON_SITELIBDIR%%/jabber/jabber.py
-%%PYTHON_SITELIBDIR%%/jabber/jabber.pyc
-%%PYTHON_SITELIBDIR%%/jabber/jabber.pyo
-%%PYTHON_SITELIBDIR%%/jabber/xmlstream.py
-%%PYTHON_SITELIBDIR%%/jabber/xmlstream.pyc
-%%PYTHON_SITELIBDIR%%/jabber/xmlstream.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/jabber
diff --git a/net-p2p/bnbt/Makefile b/net-p2p/bnbt/Makefile
index 35cfccf5f75e..bc71c2b9f2fe 100644
--- a/net-p2p/bnbt/Makefile
+++ b/net-p2p/bnbt/Makefile
@@ -3,54 +3,52 @@
PORTNAME= bnbt
PORTVERSION= 8.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= http://opensource.depthstrike.com/${PORTNAME}/
DISTNAME= ${SNAPSHOT}-${PORTNAME}${PORTVERSION:C/\.//}-src
SNAPSHOT= 20060727
MAINTAINER= flz@FreeBSD.org
-COMMENT= A C++ BitTorrent Tracker
+COMMENT= C++ BitTorrent Tracker
-USES= gmake tar:bzip2
-USE_DOS2UNIX= yes
+OPTIONS_DEFINE= MYSQL DOCS
+
+USES= dos2unix gmake tar:bzip2
SUB_FILES= pkg-message
USE_RC_SUBR= bnbt
PORTDOCS= footer.html header.html
-.if defined(WITH_MYSQL)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
ALL_TARGET= bnbtmysql
-PKGNAMESUFFIX= -mysql
USE_MYSQL= yes
.else
ALL_TARGET= bnbt
.endif
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
-
post-patch:
@${REINPLACE_CMD} -e 's|-O2|${CFLAGS} -I${PREFIX}/include| ; \
- s|LFLAGS =|LFLAGS = -L${PREFIX}/lib/mysql|' ${WRKSRC}/Makefile
+ s|LFLAGS =|LFLAGS = -L${PREFIX}/lib/mysql| ; \
+ s|g++|${CXX}|' \
+ ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|\([a-z]*\.bnbt\)|${PREFIX}/etc/${PORTNAME}/\1|' \
${WRKSRC}/config.cpp
@${REINPLACE_CMD} -e 's|bnbt.cfg|${PREFIX}/etc/${PORTNAME}/bnbt.cfg|' \
${WRKSRC}/config.h ${WRKSRC}/config.cpp ${WRKSRC}/tracker.cpp
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${ALL_TARGET} ${PREFIX}/bin/bnbt
- ${MKDIR} ${PREFIX}/etc/${PORTNAME}
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/${ALL_TARGET} ${STAGEDIR}${PREFIX}/bin/bnbt
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
.for i in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
.endfor
-.endif
-
-post-install:
- @${MKDIR} /var/log/${PORTNAME}
- @${CAT} ${PKGMESSAGE}
+ @${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}
+ ${TOUCH} ${STAGEDIR}/var/log/${PORTNAME}/.keep
+ @${MKDIR} ${STAGEDIR}${ETCDIR}
+ ${TOUCH} ${STAGEDIR}${ETCDIR}/.keep
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-p2p/bnbt/pkg-plist b/net-p2p/bnbt/pkg-plist
index efcf57ba378f..8540cf00ce69 100644
--- a/net-p2p/bnbt/pkg-plist
+++ b/net-p2p/bnbt/pkg-plist
@@ -1,5 +1,5 @@
bin/bnbt
-@exec mkdir -p /var/log/bnbt
-@exec mkdir -p %D/etc/bnbt
-@dirrmtry etc/bnbt
+%%ETCDIR%%/.keep
+/var/log/bnbt/.keep
+@dirrmtry %%ETCDIR%%
@dirrmtry /var/log/bnbt
diff --git a/net/grdesktop/Makefile b/net/grdesktop/Makefile
index b189a8aed060..6cdfc9b0123c 100644
--- a/net/grdesktop/Makefile
+++ b/net/grdesktop/Makefile
@@ -14,21 +14,18 @@ COMMENT= GNOME frontend for the remote desktop client (rdesktop)
RUN_DEPENDS= rdesktop:${PORTSDIR}/net/rdesktop
GNU_CONFIGURE= yes
-USES= gmake pkgconfig
-USE_GNOME= libgnomeui gnomeprefix gnomehack
+USES= pathfix gmake pkgconfig
+USE_GNOME= libgnomeui gnomeprefix
GCONF_SCHEMAS= grdesktop.schemas
INSTALLS_OMF= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-keymap-path=${LOCALBASE}/share/rdesktop/keymaps
-MAN1= grdesktop.1
-
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's|^\(GETTEXT_PACKAGE =\).*|\1 grdesktop|' ${WRKSRC}/po/Makefile.in.in
post-install:
- @${INSTALL_DATA} ${PREFIX}/share/pixmaps/grdesktop/icon.png ${PREFIX}/share/pixmaps/grdesktop.png
+ @${INSTALL_DATA} ${STAGEDIR}${PREFIX}/share/pixmaps/grdesktop/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/grdesktop.png
.include <bsd.port.mk>
diff --git a/net/grdesktop/pkg-plist b/net/grdesktop/pkg-plist
index eabd4f9d978e..c6208f979dfa 100644
--- a/net/grdesktop/pkg-plist
+++ b/net/grdesktop/pkg-plist
@@ -1,4 +1,5 @@
bin/grdesktop
+man/man1/grdesktop.1.gz
share/application-registry/grdesktop.applications
share/applications/grdesktop.desktop
share/gnome/help/grdesktop/C/grdesktop.xml
diff --git a/net/ldapsh/Makefile b/net/ldapsh/Makefile
index 94e0fd2e7cea..9cc841c3749a 100644
--- a/net/ldapsh/Makefile
+++ b/net/ldapsh/Makefile
@@ -21,21 +21,13 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
SUB_FILES= pkg-message
-MAN1= ldapsh.1
-MAN3= Net::LDAP::Shell.3 Net::LDAP::Config.3 \
- Net::LDAP::Shell::Parse.3 Net::LDAP::Shell::Util.3
-
-USES= perl5
+USES= perl5 shebangfix
USE_PERL5= configure
-
-NO_STAGE= yes
-post-patch:
- ${REINPLACE_CMD} -e "s,/usr/local/bin/perl,${PERL}," ${WRKSRC}/ldapsh
+SHEBANG_FILES= ldapsh
post-install:
- ${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/COMMANDS ${DOCSDIR}/
- ${INSTALL_DATA} ${WRKSRC}/examples/ldapsh_config ${EXAMPLESDIR}/
- @${CAT} ${PKGMESSAGE}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/COMMANDS ${STAGEDIR}${DOCSDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/examples/ldapsh_config ${STAGEDIR}${EXAMPLESDIR}/
.include <bsd.port.mk>
diff --git a/net/ldapsh/pkg-plist b/net/ldapsh/pkg-plist
index ec5a6e113adc..c4c45fea674d 100644
--- a/net/ldapsh/pkg-plist
+++ b/net/ldapsh/pkg-plist
@@ -20,6 +20,11 @@ bin/ldapsh
%%SITE_PERL%%/Net/LDAP/Shell/Util.pm
%%SITE_PERL%%/Net/LDAP/Shell/grammar.yp
%%SITE_PERL%%/Net/LDAP/Shell/makefile
+%%PERL5_MAN3%%/Net::LDAP::Config.3.gz
+%%PERL5_MAN3%%/Net::LDAP::Shell.3.gz
+%%PERL5_MAN3%%/Net::LDAP::Shell::Parse.3.gz
+%%PERL5_MAN3%%/Net::LDAP::Shell::Util.3.gz
+man/man1/ldapsh.1.gz
%%DOCSDIR%%/COMMANDS
%%EXAMPLESDIR%%/ldapsh_config
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ldapsh
diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile
index e52ecf832a3b..6661dc3b7fe5 100644
--- a/sysutils/testdisk/Makefile
+++ b/sysutils/testdisk/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= testdisk
-PORTVERSION= 6.13
-PORTREVISION= 1
+PORTVERSION= 6.14
CATEGORIES= sysutils
MASTER_SITES= http://www.cgsecurity.org/
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
@@ -10,16 +9,18 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= flz@FreeBSD.org
COMMENT= Tool to check and undelete partitions
-LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg
-USE_BZIP2= yes
+USES= tar:bzip2
GNU_CONFIGURE= yes
CPPFLAGS+= -I${PREFIX}/include
LDFLAGS+= -L${PREFIX}/lib
CONFIGURE_ARGS= --without-ewf
-MAN8= fidentify.8 testdisk.8 photorec.8
-PLIST_FILES= bin/fidentify bin/testdisk bin/photorec
+PLIST_FILES= bin/fidentify bin/testdisk bin/photorec \
+ man/man8/fidentify.8.gz man/man8/photorec.8.gz \
+ man/man8/testdisk.8.gz
+
PORTDOCS= *
OPTIONS_DEFINE= ICONV PROGSREISERFS NTFS DOCS
@@ -32,18 +33,8 @@ NTFSPROGS_DESC= Use ntfsprogs extensions
PROGSREISERFS_DESC= Use reiserfs extensions
# E2FSPROGS "Use ext2fs extensions" off \
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
-
-#.if !defined(NOPORTDOCS)
-#DISTFILES+= ${PORTNAME}-doc-${PORTVERSION}${EXTRACT_SUFX}
-#.endif
-
-.if ${PORT_OPTIONS:MICONV}
-USES= iconv
-.else
-CONFIGURE_ARGS+=--without-iconv
-.endif
+ICONV_USES= iconv
+ICONV_CONFIGURE_OFF= --without-iconv
# e2fsprogs does not provide ext2fs.so any more
# since it does not do 'make install-libs'
@@ -53,30 +44,17 @@ CONFIGURE_ARGS+=--without-iconv
#CONFIGURE_ARGS+=--without-ext2fs
#.endif
-.if ${PORT_OPTIONS:MNTFS3G}
-LIB_DEPENDS+= ntfs-3g:${PORTSDIR}/sysutils/fusefs-ntfs
-.else
-CONFIGURE_ARGS+=--without-ntfs3g
-.endif
+NTFS3G_LIB_DEPENDS= libntfs-3g.so:${PORTSDIR}/sysutils/fusefs-ntfs
+NTFS3G_CONFIGURE_OFF= --without-ntfs3g
-.if ${PORT_OPTIONS:MNTFSPROGS}
-LIB_DEPENDS+= ntfs:${PORTSDIR}/sysutils/ntfsprogs
-.else
-CONFIGURE_ARGS+=--without-ntfs
-.endif
+NTFSPROGS_LIB_DEPENDS= libntfs.so:${PORTSDIR}/sysutils/ntfsprogs
+NTFS_PROGS_CONFIGURE_ARGS= --without-ntfs
-.if ${PORT_OPTIONS:MPROGSREISERFS}
-LIB_DEPENDS+= reiserfs-0.3.0:${PORTSDIR}/sysutils/progsreiserfs
-.else
-CONFIGURE_ARGS+=--without-reiserfs
-.endif
+PROGSREISERFS_LIB_DEPENDS= libreiserfs-0.3.so:${PORTSDIR}/sysutils/progsreiserfs
+PROGSREISERFS_CONFIGURE_OFF= --without-reiserfs
post-patch:
-.if ${PORT_OPTIONS:MDOCS}
@${REINPLACE_CMD} -e 's|/doc/.(PACKAGE)-.(VERSION)|/doc/${PORTNAME}|' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e '/doc\/testdisk\/html/d' ${WRKSRC}/Makefile.in
-.else
- @${REINPLACE_CMD} -e '/\/doc\/$$(PACKAGE)-$$(VERSION)/d' ${WRKSRC}/Makefile.in
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/testdisk/distinfo b/sysutils/testdisk/distinfo
index 7383af245cc8..8295d010c0ce 100644
--- a/sysutils/testdisk/distinfo
+++ b/sysutils/testdisk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (testdisk-6.13.tar.bz2) = 48275ccddfc9445b6c3e6e181728dae9e49bd25b824a6b5670d58f1f88cdf220
-SIZE (testdisk-6.13.tar.bz2) = 560696
+SHA256 (testdisk-6.14.tar.bz2) = a597c3ebc375acdf0ff60f44ed8935a301132aae78ec00f64f091637d055326c
+SIZE (testdisk-6.14.tar.bz2) = 620077
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-22 03:36:52 +0000