diff options
| author | mi <mi@FreeBSD.org> | 2010-02-25 11:42:07 +0800 |
|---|---|---|
| committer | mi <mi@FreeBSD.org> | 2010-02-25 11:42:07 +0800 |
| commit | 3d57ce9b34cbe1d96f28395c0c26aa6781283a65 (patch) | |
| tree | 5edc8b46b8ae1a75849136013d334de391aaccf5 /www/websh | |
| parent | d1d9d564531751ec2f7c7115097697d0f749e5a1 (diff) | |
| download | freebsd-ports-gnome-3d57ce9b34cbe1d96f28395c0c26aa6781283a65.tar.gz freebsd-ports-gnome-3d57ce9b34cbe1d96f28395c0c26aa6781283a65.tar.zst freebsd-ports-gnome-3d57ce9b34cbe1d96f28395c0c26aa6781283a65.zip | |
Clean-up the atavisms accidentally left out by the prior commit. The
OPTIONS no longer had an effect.
Feature safe: yes
Diffstat (limited to 'www/websh')
| -rw-r--r-- | www/websh/Makefile | 11 | ||||
| -rw-r--r-- | www/websh/files/shared-patch | 20 |
2 files changed, 0 insertions, 31 deletions
diff --git a/www/websh/Makefile b/www/websh/Makefile index 5bd35309976b..e076868d22a1 100644 --- a/www/websh/Makefile +++ b/www/websh/Makefile @@ -17,9 +17,6 @@ COMMENT= Embeds a TCL8 interpreter in the Apache server MAKE_JOBS_UNSAFE= yes -OPTIONS= WSMDEBUG "memory(n) and checkmem(n) commands in web-scripts" on -OPTIONS+= WSSTATIC "Link the objects into the module statically" off - TCL_DVER= ${TCL_VER:S/.//} USE_TCL= 84+ @@ -88,14 +85,6 @@ post-install: .include <bsd.port.pre.mk> -.if defined(WITH_WSMDEBUG) -CFLAGS+= -DTCL_MEM_DEBUG -.endif - -.if defined(WITHOUT_WSSTATIC) -EXTRA_PATCHES= ${FILESDIR}/shared-patch -.endif - CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" .include <bsd.port.post.mk> diff --git a/www/websh/files/shared-patch b/www/websh/files/shared-patch deleted file mode 100644 index f4bb5365831c..000000000000 --- a/www/websh/files/shared-patch +++ /dev/null @@ -1,20 +0,0 @@ -Link the module (and the executable - websh) dynamically with --lwebsh84, instead of statically with all of the object files. This -reduces the size of the module by a factor of 5. - - -mi - ---- Makefile.in Sun Mar 5 11:58:37 2006 -+++ Makefile.in Thu Feb 8 19:37:14 2007 -@@ -256,9 +256,9 @@ - - websh$(VERSION): tclAppInit.$(OBJEXT) $(web_OBJECTS) -- $(CC) @LDFLAGS@ tclAppInit.$(OBJEXT) $(web_OBJECTS) \ -+ $(CC) @LDFLAGS@ tclAppInit.$(OBJEXT) $(web_LIB_FILE) \ - $(TCL_LIB_SPEC) $(TCL_LIBS) $(TCL_LD_FLAGS) -o websh$(VERSION) - - mod_websh$(MODULE_LIB_SUFFIX): $(web_ap_OBJECTS) -- $(SHLIB_LD_CURRENT) -o mod_websh$(MODULE_LIB_SUFFIX) $(web_ap_OBJECTS) $(TCL_LIB_SPEC) -+ $(SHLIB_LD_CURRENT) -o mod_websh$(MODULE_LIB_SUFFIX) $(web_OBJECTS_ap) $(web_LIB_FILE) $(TCL_LIB_SPEC) - - mod_websh$(UNSHARED_LIB_SUFFIX): $(web_ap_OBJECTS) |