Index: head/chinese/metalist/Makefile =================================================================== --- head/chinese/metalist/Makefile (revision 130768) +++ head/chinese/metalist/Makefile (revision 130769) @@ -1,106 +1,104 @@ # New ports collection makefile for: metalist # Date created: 18 March 2002 # Whom: Autrijus Tang # # $FreeBSD$ # PORTNAME= metalist PORTVERSION= 2.2.6 PORTREVISION= 11069 CATEGORIES= chinese www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= slashcode DISTNAME= slash-${PORTVERSION} PATCH_SITES= http://p4.elixus.org/hist/ PATCHFILES= metalist-${PORTREVISION}${EXTRACT_SUFX} MAINTAINER= autrijus@autrijus.org COMMENT= A Chinese port of Slash-Like Automatic Storytelling Homepage system BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \ ${SITE_PERL}/Bundle/Slash.pm:${PORTSDIR}/www/p5-Bundle-Slash \ ${SITE_PERL}/Locale/Maketext/Lexicon.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \ ${SITE_PERL}/Locale/Maketext/Simple.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \ ${SITE_PERL}/Test/Harness.pm:${PORTSDIR}/devel/p5-Test-Harness \ ${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple RUN_DEPENDS= ${BUILD_DEPENDS} -BROKEN= Incorrect pkg-plist - .if defined(WITH_OURNET) CONFIGURE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--default MAKE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--default .else CONFIGURE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--skip MAKE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--skip .endif .if defined(WITH_APACHE2) BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2 DEPENDS_ARGS+= WITHOUT_MODPERL=yes DEPENDS_ARGS+= WITH_MODPERL2=yes DEPENDS_ARGS+= WITH_APACHE2=yes DEPENDS_ARGS+= BATCH=yes .else BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl .endif DOCS= README README.metalist INSTALL NO_BUILD= yes USE_REINPLACE= yes CONFLICTS= slash-[0-9]* MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= FZ.3 Slash.3 Slash::Apache.3 Slash::Apache::Banlist.3 \ Slash::Apache::Log.3 Slash::Apache::User.3 \ Slash::Custom::Bulkmail.3 Slash::DB.3 Slash::DB::MySQL.3 \ Slash::DB::Oracle.3 Slash::DB::PostgreSQL.3 \ Slash::DB::Static::MySQL.3 Slash::DB::Static::Oracle.3 \ Slash::DB::Static::PostgreSQL.3 Slash::DB::Utility.3 \ Slash::Display.3 Slash::Display::Plugin.3 \ Slash::Display::Provider.3 Slash::Install.3 Slash::Journal.3 \ Slash::Messages.3 Slash::Messages::DB::MySQL.3 \ Slash::Search.3 Slash::Test.3 Slash::Utility.3 \ Slash::Utility::Access.3 Slash::Utility::Anchor.3 \ Slash::Utility::Data.3 Slash::Utility::Display.3 \ Slash::Utility::Environment.3 Slash::Utility::System.3 \ Slash::XML.3 Slash::XML::RSS.3 pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" @${ECHO} " WITH_APACHE2 Use Apache2 as the web server" @${ECHO} " WITH_OURNET Install support for OurNet::BBS" @${ECHO} "" do-patch: @${MV} ${WRKSRC} ${WRKDIR}/src @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${PATCHFILES} ${EXTRACT_AFTER_ARGS}) @${MV} ${WRKDIR}/src ${WRKSRC} @(cd ${WRKSRC} && ${PATCH} < ${MASTERDIR}/files/patch-Makefile 2>/dev/null) .if defined(WITH_APACHE2) @(cd ${WRKDIR} && ${PATCH} < ${WRKSRC}/slash-2.2.6-modperl2.diff.txt 2>/dev/null) .endif @${REINPLACE_CMD} -E -e 's,/usr/local,${PREFIX},g' \ -e 's,(\$\(PERL\) Makefile.PL),\1 PREFIX=\$$\(PREFIX\),g' \ ${WRKSRC}/Makefile post-install: @${FIND} ${PREFIX}/slash -name "*.orig" -or -name "*.bak" -delete .if defined(WITH_APACHE2) @${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g -e s!%%APACHE%%!apache2!g ${PKGMESSAGE} .else @${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g -e s!%%APACHE%%!apache!g ${PKGMESSAGE} .endif .include .if ${PERL_LEVEL} < 500601 IGNORE= This program only support perl 5.6.1 or above .endif .include Property changes on: head/chinese/metalist/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/chinese/metalist/files/patch-Makefile =================================================================== --- head/chinese/metalist/files/patch-Makefile (revision 130768) +++ head/chinese/metalist/files/patch-Makefile (revision 130769) @@ -1,21 +1,48 @@ ---- Makefile.old Mon Mar 18 19:22:59 2002 -+++ Makefile Mon Mar 18 19:22:25 2002 +--- Makefile.orig Wed Jul 3 17:22:34 2002 ++++ Makefile Tue Mar 8 15:52:54 2005 +@@ -62,7 +62,7 @@ + slash: + @echo "=== INSTALLING SLASH MODULES ===" + @if [ ! "$(RPM)" ] ; then \ +- (cd Slash; $(PERL) Makefile.PL; make install UNINST=1); \ ++ (cd Slash; $(PERL) Makefile.PL; make all pure_install UNINST=1); \ + else \ + echo " - Performing an RPM build"; \ + (cd Slash; $(PERL) Makefile.PL INSTALLSITEARCH=$(INSTALLSITEARCH) INSTALLSITELIB=$(INSTALLSITELIB) INSTALLMAN3DIR=$(INSTALLMAN3DIR); make install UNINST=1); \ +@@ -77,7 +77,7 @@ + if [ -f Makefile.PL ]; then \ + if [ ! "$(RPM)" ] ; then \ + $(PERL) Makefile.PL; \ +- make install UNINST=1;\ ++ make all pure_install UNINST=1;\ + else \ + echo " - Performing an RPM build."; \ + $(PERL) Makefile.PL INSTALLSITEARCH=$(INSTALLSITEARCH) INSTALLSITELIB=$(INSTALLSITELIB) INSTALLMAN3DIR=$(INSTALLMAN3DIR); \ +@@ -86,7 +86,7 @@ + fi); \ + done) + +-all: install ++all: + + install: slash plugins + @@ -167,15 +167,11 @@ if [ -d $(INIT) ]; then \ init=$(INIT); \ fi; \ - elif [ -d /etc/init.d ]; then \ - init=/etc; \ - elif [ -d /etc/rc.d/init.d ]; then \ - init=/etc/rc.d; \ + elif [ -d /usr/local/etc/rc.d ]; then \ + init=/usr/local/etc/rc.d; \ fi; \ if [ $$init ]; then \ - $(INSTALL) utils/slash $$init/init.d/; \ - ln -s -f ../init.d/slash $$init/rc3.d/S99slash; \ - ln -s -f ../init.d/slash $$init/rc6.d/K99slash; \ + $(INSTALL) utils/slash $$init/slash.sh; \ else \ echo "*** Makefile can't determine where your init scripts live."; \ if [ $$init ]; then \ Property changes on: head/chinese/metalist/files/patch-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property