diff options
author | Lars Koeller <lkoeller@FreeBSD.org> | 2001-12-03 21:27:29 +0000 |
---|---|---|
committer | Lars Koeller <lkoeller@FreeBSD.org> | 2001-12-03 21:27:29 +0000 |
commit | 128c79b0d4f717a57a800d734bab40c0e27ed12a (patch) | |
tree | 76459b07236f00a60b818a352ed00904bc1fe89f /sysutils | |
parent | Use ${FILESDIR} appropriately. Use kpsewhich to find tex. (diff) |
* Add HTML documentation
* Fix problems with libwrap support
Notes
Notes:
svn path=/head/; revision=50994
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/apcupsd/Makefile | 23 | ||||
-rw-r--r-- | sysutils/apcupsd/files/patch-aa | 55 | ||||
-rw-r--r-- | sysutils/apcupsd/pkg-plist | 55 |
3 files changed, 127 insertions, 6 deletions
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 7563710ef35c..0ed95fdc0692 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -7,7 +7,7 @@ PORTNAME= apcupsd PORTVERSION= 3.8.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.apcupsd.org/pub/apcupsd/stable/tar/ @@ -32,7 +32,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ # Cause FreeBSD 3.X misses libmenu, libforms and libpanel (curses) .if ${OSVERSION} > 400000 -CONFIGURE_ARGS+=--enable-powerflute +CONFIGURE_ARGS+=--enable-powerflute --with-libwrap PLIST_SUB+= POWERFL="" .else PLIST_SUB+= POWERFL="@comment " @@ -40,7 +40,22 @@ PLIST_SUB+= POWERFL="@comment " MAN8= "apcupsd.8" -PORTDOCS= doc/manual/apcupsd.pdf +PORTDOCS= apcupsd.pdf apcaccess.html apcnisd.html apcupsd-styles.css \ + apcupsd.apf apcupsd.book apcupsd.gif apcupsd.html batteries.html \ + bugs.html cables.html cgiprogs.html charging.gif \ + config-examples.html configure.html data.html eprom.html \ + events.html faq.html index.html install.html invoking.html \ + kernel_config.html license.html logging.html master-slave.html \ + multiUPS.html multimon.gif new_features_3_7_0.html \ + new_features_3_8_0.html new_features_3_8_1.html \ + new_features_3_8_2.html new_features_3_8_3.html \ + oldversions.html onbatt.gif online.gif security.html \ + shutdown.html status.gif status.html stopping.html testing.html \ + thanks.gif thanks.html troubles.html upgrading_to_3_7_0.html \ + upsbible.html usb.html win32.html wininstall1.gif wininstall2.gif \ + wininstall3.gif wininstall4.gif wininstall5.gif wininstall6.gif \ + wininstall7.gif + post-install: ${INSTALL_SCRIPT} ${FILESDIR}/${STARTUP_SCRIPT} \ @@ -48,7 +63,7 @@ post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for file in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/manual/${file} ${DOCSDIR} .endfor .endif diff --git a/sysutils/apcupsd/files/patch-aa b/sysutils/apcupsd/files/patch-aa index 40f316a49128..b59910759bc5 100644 --- a/sysutils/apcupsd/files/patch-aa +++ b/sysutils/apcupsd/files/patch-aa @@ -1,5 +1,56 @@ -*** ../../configure Sat Dec 1 19:51:44 2001 ---- configure Sat Dec 1 19:53:05 2001 +*** configure.orig Tue Nov 27 22:44:39 2001 +--- configure Mon Dec 3 22:12:31 2001 +*************** +*** 4134,4140 **** + # Check for TCP wrapper support + #-------------------------------------------------------------------- + +! with_libwrap=no + # Check whether --with-libwrap or --without-libwrap was given. + if test "${with_libwrap+set}" = set; then + withval="$with_libwrap" +--- 4134,4140 ---- + # Check for TCP wrapper support + #-------------------------------------------------------------------- + +! #with_libwrap=no + # Check whether --with-libwrap or --without-libwrap was given. + if test "${with_libwrap+set}" = set; then + withval="$with_libwrap" +*************** +*** 4179,4185 **** + fi + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 +! LIBS="$LIBS -lwrap -lnsl" + echo $ac_n "checking for TCP wrappers library -lwrap""... $ac_c" 1>&6 + echo "configure:4185: checking for TCP wrappers library -lwrap" >&5 + cat > conftest.$ac_ext <<EOF +--- 4179,4185 ---- + fi + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 +! LIBS="$LIBS -lwrap" + echo $ac_n "checking for TCP wrappers library -lwrap""... $ac_c" 1>&6 + echo "configure:4185: checking for TCP wrappers library -lwrap" >&5 + cat > conftest.$ac_ext <<EOF +*************** +*** 4206,4212 **** + #define HAVE_LIBWRAP 1 + EOF + +! WRAPLIBS="-L$with_libwrap/lib -lwrap -lnsl" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +--- 4206,4212 ---- + #define HAVE_LIBWRAP 1 + EOF + +! WRAPLIBS="-L$with_libwrap/lib -lwrap" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 *************** *** 4327,4333 **** echo $ac_n "(cached) $ac_c" 1>&6 diff --git a/sysutils/apcupsd/pkg-plist b/sysutils/apcupsd/pkg-plist index 1989a6db8d5a..1f952a98cd0e 100644 --- a/sysutils/apcupsd/pkg-plist +++ b/sysutils/apcupsd/pkg-plist @@ -22,6 +22,61 @@ etc/apcupsd/cgi/upsstats.cgi etc/rc.d/%%STARTUP_SCRIPT%% share/locale/it/LC_MESSAGES/apcupsd.mo %%PORTDOCS%%share/doc/apcupsd/apcupsd.pdf +%%PORTDOCS%%share/doc/apcupsd/apcaccess.html +%%PORTDOCS%%share/doc/apcupsd/apcnisd.html +%%PORTDOCS%%share/doc/apcupsd/apcupsd-styles.css +%%PORTDOCS%%share/doc/apcupsd/apcupsd.apf +%%PORTDOCS%%share/doc/apcupsd/apcupsd.book +%%PORTDOCS%%share/doc/apcupsd/apcupsd.gif +%%PORTDOCS%%share/doc/apcupsd/apcupsd.html +%%PORTDOCS%%share/doc/apcupsd/batteries.html +%%PORTDOCS%%share/doc/apcupsd/bugs.html +%%PORTDOCS%%share/doc/apcupsd/cables.html +%%PORTDOCS%%share/doc/apcupsd/cgiprogs.html +%%PORTDOCS%%share/doc/apcupsd/charging.gif +%%PORTDOCS%%share/doc/apcupsd/config-examples.html +%%PORTDOCS%%share/doc/apcupsd/configure.html +%%PORTDOCS%%share/doc/apcupsd/data.html +%%PORTDOCS%%share/doc/apcupsd/eprom.html +%%PORTDOCS%%share/doc/apcupsd/events.html +%%PORTDOCS%%share/doc/apcupsd/faq.html +%%PORTDOCS%%share/doc/apcupsd/index.html +%%PORTDOCS%%share/doc/apcupsd/install.html +%%PORTDOCS%%share/doc/apcupsd/invoking.html +%%PORTDOCS%%share/doc/apcupsd/kernel_config.html +%%PORTDOCS%%share/doc/apcupsd/license.html +%%PORTDOCS%%share/doc/apcupsd/logging.html +%%PORTDOCS%%share/doc/apcupsd/master-slave.html +%%PORTDOCS%%share/doc/apcupsd/multiUPS.html +%%PORTDOCS%%share/doc/apcupsd/multimon.gif +%%PORTDOCS%%share/doc/apcupsd/new_features_3_7_0.html +%%PORTDOCS%%share/doc/apcupsd/new_features_3_8_0.html +%%PORTDOCS%%share/doc/apcupsd/new_features_3_8_1.html +%%PORTDOCS%%share/doc/apcupsd/new_features_3_8_2.html +%%PORTDOCS%%share/doc/apcupsd/new_features_3_8_3.html +%%PORTDOCS%%share/doc/apcupsd/oldversions.html +%%PORTDOCS%%share/doc/apcupsd/onbatt.gif +%%PORTDOCS%%share/doc/apcupsd/online.gif +%%PORTDOCS%%share/doc/apcupsd/security.html +%%PORTDOCS%%share/doc/apcupsd/shutdown.html +%%PORTDOCS%%share/doc/apcupsd/status.gif +%%PORTDOCS%%share/doc/apcupsd/status.html +%%PORTDOCS%%share/doc/apcupsd/stopping.html +%%PORTDOCS%%share/doc/apcupsd/testing.html +%%PORTDOCS%%share/doc/apcupsd/thanks.gif +%%PORTDOCS%%share/doc/apcupsd/thanks.html +%%PORTDOCS%%share/doc/apcupsd/troubles.html +%%PORTDOCS%%share/doc/apcupsd/upgrading_to_3_7_0.html +%%PORTDOCS%%share/doc/apcupsd/upsbible.html +%%PORTDOCS%%share/doc/apcupsd/usb.html +%%PORTDOCS%%share/doc/apcupsd/win32.html +%%PORTDOCS%%share/doc/apcupsd/wininstall1.gif +%%PORTDOCS%%share/doc/apcupsd/wininstall2.gif +%%PORTDOCS%%share/doc/apcupsd/wininstall3.gif +%%PORTDOCS%%share/doc/apcupsd/wininstall4.gif +%%PORTDOCS%%share/doc/apcupsd/wininstall5.gif +%%PORTDOCS%%share/doc/apcupsd/wininstall6.gif +%%PORTDOCS%%share/doc/apcupsd/wininstall7.gif @dirrm etc/apcupsd/cgi @dirrm etc/apcupsd %%PORTDOCS%%@dirrm share/doc/apcupsd |